Merge pull request 'fix(completion): scan nested commands in unfinished braced args' (#37) from #36 into main

Reviewed-on: #37

.vscode/launch.json

@@ -17,6 +17,19 @@
             ],
             "cwd": "${env:TEMP}/nx-post-support-vscode-debug",
             "outFiles": ["${env:TEMP}/nx-post-support-vscode-debug/dist/**/*.js"],
+            "linux": {
+                "args": [
+                    "--extensionDevelopmentPath=${workspaceFolder}",
+                    "${workspaceFolder}",
+                    "${workspaceFolder}/test/test.tcl"
+                ],
+                "cwd": "${workspaceFolder}",
+                "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+                "resolveSourceMapLocations": [
+                    "${workspaceFolder}/dist/**/*.js",
+                    "!**/node_modules/**"
+                ]
+            },
             "sourceMaps": true,
             "resolveSourceMapLocations": [
                 "${env:TEMP}/nx-post-support-vscode-debug/dist/**/*.js",
@@ -50,6 +63,19 @@
             ],
             "cwd": "${env:TEMP}/nx-post-support-vscode-debug",
             "outFiles": ["${env:TEMP}/nx-post-support-vscode-debug/dist/**/*.js"],
+            "linux": {
+                "args": [
+                    "--extensionDevelopmentPath=${workspaceFolder}",
+                    "${workspaceFolder}",
+                    "${workspaceFolder}/test/test.tcl"
+                ],
+                "cwd": "${workspaceFolder}",
+                "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+                "resolveSourceMapLocations": [
+                    "${workspaceFolder}/dist/**/*.js",
+                    "!**/node_modules/**"
+                ]
+            },
             "sourceMaps": true,
             "resolveSourceMapLocations": [
                 "${env:TEMP}/nx-post-support-vscode-debug/dist/**/*.js",

.vscode/tasks.json

@@ -15,6 +15,13 @@
                 "${workspaceFolder}",
                 "${env:TEMP}\\nx-post-support-vscode-debug"
             ],
+            "linux": {
+                "command": "npm",
+                "args": ["run", "compile:debug"],
+                "options": {
+                    "cwd": "${workspaceFolder}"
+                }
+            },
             "problemMatcher": [],
             "presentation": {
                 "reveal": "always",

package.json

@@ -2,7 +2,7 @@
   "name": "nx-post-support",
   "displayName": "NX Postprocessor Support",
   "description": "VS Code extension for NX CAM postprocessor development with language support and remote Tcl debugging for CDL, TCL, and DEF files",
-  "version": "2026.9.100",
+  "version": "2026.9.210",
   "publisher": "Christoph",
   "icon": "images/nx-1.png",
   "activationEvents": [

server/src/tools/tcl_command_completion.py

@@ -1009,7 +1009,13 @@ def _current_command_segment(line_prefix: str) -> str:
         starts.append(brace_starts[-1] + 1)
     if bracket_starts:
         starts.append(bracket_starts[-1] + 1)
-    return line_prefix[max(starts) :]
+    start = max(starts)
+    if brace_starts and start == brace_starts[-1] + 1:
+        # An unfinished braced body or expression can itself contain commands
+        # (for example, ``if {[string compare ...``). Scan that inner context
+        # independently, while keeping completed braced arguments opaque.
+        return _current_command_segment(line_prefix[start:])
+    return line_prefix[start:]
 
 
 def _tokenize_command_segment(segment: str) -> list[str]:

server/tests/python_tests/test_completion_context.py

@@ -204,6 +204,29 @@ def test_string_completion_handles_nested_commands_and_is_values():
     }
 
 
+def test_string_completion_inside_braced_conditions_and_bodies():
+    for prefix in ("if {", "while {", "proc example {} { if {"):
+        subcommands = _argument_completion_labels(prefix + "[string ")
+        assert subcommands is not None
+        assert {"compare", "equal", "is"} <= subcommands
+        assert _argument_completion_labels(prefix + "[string compare -") == {
+            "-length", "-nocase"
+        }
+        assert _argument_completion_labels(
+            prefix + "[string compare -nocase "
+        ) == {"-length"}
+
+
+def test_closed_braced_arguments_do_not_change_completion_context():
+    assert _argument_completion_labels("puts {[string compare }") is None
+    assert _argument_completion_labels(
+        "if {[string equal a b]} {string compare "
+    ) == {"-length", "-nocase"}
+    assert _argument_completion_labels(
+        "if {[string equal a b] && [string is integer "
+    ) == {"-failindex", "-strict"}
+
+
 def test_dict_array_namespace_file_and_info_subcommands():
     dict_items = _argument_completion_labels("dict ")
     assert dict_items is not None

syntaxes/def.tmLanguage.json

@@ -5,6 +5,9 @@
 		{
 			"include": "#comment"
 		},
+		{
+			"include": "#escaped-quoted-strings"
+		},
 		{
 			"include": "#strings"
 		},
@@ -28,6 +31,31 @@
 		}
 	],
 	"repository": {
+		"escaped-quoted-strings": {
+			"name": "string.quoted.double.def",
+			"begin": "\\\\\"",
+			"end": "\\\\\"",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.def"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.def"
+				}
+			},
+			"patterns": [
+				{
+					"name": "constant.character.escape.def",
+					"match": "\\\\."
+				},
+				{
+					"name": "variable.other.property",
+					"match": "\\$[_a-zA-Z][_a-zA-Z0-9]*(\\(\\$?[_a-zA-Z][_a-zA-Z0-9]*(,\\$?[_a-zA-Z][_a-zA-Z0-9]*)*\\))?"
+				}
+			]
+		},
 		"keywords": {
 			"patterns": [
 				{
@@ -151,4 +179,4 @@
 		}
 	},
 	"scopeName": "source.def"
-}
+}