Merge pull request 'tcl_language_support' (#15) from tcl_language_support into main

Reviewed-on: #15

client/src/common/settings.ts

@@ -78,7 +78,8 @@ export async function getWorkspaceSettings(
         path: resolveVariables(config.get<string[]>(`path`) ?? [], workspace),
         interpreter: resolveVariables(interpreter, workspace),
         importStrategy: config.get<string>(`importStrategy`) ?? "useBundled",
-        showNotifications: config.get<string>(`showNotifications`) ?? "off"
+        showNotifications: config.get<string>(`showNotifications`) ?? "off",
+        formatter: config.get<boolean>(`formatter`) ?? false
     }
     return workspaceSetting
 }
@@ -109,7 +110,8 @@ export async function getGlobalSettings(
         path: getGlobalValue<string[]>(config, "path", []),
         interpreter: interpreter,
         importStrategy: getGlobalValue<string>(config, "importStrategy", "useBundled"),
-        showNotifications: getGlobalValue<string>(config, "showNotifications", "off")
+        showNotifications: getGlobalValue<string>(config, "showNotifications", "off"),
+        formatter: config.get<boolean>(`formatter`) ?? false
     }
     return setting
 }
@@ -123,7 +125,8 @@ export function checkIfConfigurationChanged(
         `${namespace}.path`,
         `${namespace}.interpreter`,
         `${namespace}.importStrategy`,
-        `${namespace}.showNotifications`
+        `${namespace}.showNotifications`,
+        `${namespace}.formatter`
     ]
     const changed = settings.map((s) => e.affectsConfiguration(s))
     return changed.includes(true)

package.json

@@ -2,7 +2,7 @@
   "name": "nx-post-support",
   "displayName": "NX Postprocessor Support",
   "description": "",
-  "version": "0.4.3",
+  "version": "0.4.6",
   "publisher": "Christoph",
   "serverInfo": {
     "name": "NX Postprocessor Support",
@@ -79,6 +79,11 @@
     ],
     "configuration": {
       "properties": {
+        "nx-post-support.formatter": {
+          "type": "boolean",
+          "default": false,
+          "description": "Use the TCL formatter from `NX Postprocessor Support`"
+        },
         "nx-post-support.importStrategy": {
           "default": "useBundled",
           "description": "Defines where `NX Postprocessor Support` is imported from.",
@@ -118,4 +123,4 @@
     "prettier": "^3.4.2",
     "typescript": "^5.7.2"
   }
-}
+}

server/src/common/formatter.py

@@ -15,43 +15,48 @@ def format_tcl(src: str, indent_str="    ") -> str:
     for raw_line in src.splitlines():
         stripped = raw_line.strip()
 
-        # 1) Single-line 'if {cond} {action}' → no indent change
+        # Comments are ignored
+        if stripped.startswith("#"):
+            out_lines.append(indent_str * level + stripped)
+            continue
+
+        # Single-line 'if {cond} {action}' → no indent change
         if re.match(r"^(if|elseif)\s*\{[^}]+\}\s*\{[^}]+\}$", stripped):
             out_lines.append(indent_str * level + stripped)
             continue
 
-        # 2) Combined '} else {' → dedent, print, then indent
+        # Combined '} else {' → dedent, print, then indent
         if re.match(r"^\}\s*(elseif|else)\b.*\{$", stripped):
             level = max(level - 1, 0)
             out_lines.append(indent_str * level + stripped)
             level += 1
             continue
 
-        # 3) SPECIAL: closing brace plus tag on same line: '} Tag'
-        m = re.match(r"^\}\s+\w+.*", stripped)
-        if m:
+        # SPECIAL: closing brace plus tag on same line: '} Tag'
+        m = re.match(r"^\}\s+(.+)", stripped)
+        if m and not stripped.startswith("#"):
             # close one block
             level = max(level - 1, 0)
             # stay on one line: "} Tag"
             out_lines.append(f"{indent_str * level}}} {m.group(1)}")
             continue
 
-        # 4) Pure '}' → dedent then print
+        # Pure '}' → dedent then print
         if stripped == "}":
             level = max(level - 1, 0)
             out_lines.append(f"{indent_str * level}{stripped}")
             continue
 
-        # 5) 'elseif' or 'else' alone → align with matching 'if'
+        # 'elseif' or 'else' alone → align with matching 'if'
         if re.match(r"^(elseif|else)\b(?!.*\{)", stripped):
             level = max(level - 1, 0)
             out_lines.append(f"{indent_str * level}{stripped}")
             continue
 
-        # 6) Default: print at current indent
+        # Default: print at current indent
         out_lines.append(f"{indent_str * level}{stripped}")
 
-        # 7) Open a new block on lines ending with '{'
+        # Open a new block on lines ending with '{'
         if re.match(r"^(if|elseif)\b.*\{$", stripped) or stripped.endswith("{"):
             level += 1
 

server/src/lsp_server.py

@@ -54,9 +54,6 @@ LSP_SERVER = server.LanguageServer(
     name="NX Postprocessor Support", version="0.0.1", max_workers=MAX_WORKERS
 )
 
-
-NX_PROC_LIST = []
-
 # **********************************************************
 # Tool specific code goes below this.
 # **********************************************************
@@ -185,6 +182,7 @@ def _get_global_defaults():
         "args": GLOBAL_SETTINGS.get("args", []),
         "importStrategy": GLOBAL_SETTINGS.get("importStrategy", "useBundled"),
         "showNotifications": GLOBAL_SETTINGS.get("showNotifications", "off"),
+        "formatter": GLOBAL_SETTINGS.get("formatter", False),
     }