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

Reviewed-on: #37
fix(completion): scan nested commands in unfinished braced args
2026-09-08 19:21:49 +00:00 · 2026-09-08 21:16:58 +02:00 · 2026-09-04 11:46:55 +00:00 · 2026-09-04 11:39:08 +00:00 · 2026-09-04 08:39:46 +02:00 · 2026-09-03 08:39:22 +00:00
6 changed files with 93 additions and 3 deletions
@@ -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",
@@ -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",
@@ -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": [
@@ -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]:
@@ -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
@@ -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": [
 				{
Author	SHA1	Message	Date
Christoph	9b368ba761	Merge pull request 'fix(completion): scan nested commands in unfinished braced args' (#37 ) from #36 into main build_and_puplish.yml / build_and_publish (release) Successful in 34s Details Reviewed-on: #37	2026-09-08 19:21:49 +00:00
Christoph	82e13cf7ce	fix(completion): scan nested commands in unfinished braced args Make the completion parser inspect nested command segments when an unfinished braced argument is the active context, instead of treating the entire braced body as opaque. This resolves cases where inner commands (e.g. command substitutions) were ignored and improves suggestion accuracy. Tests were added to cover nested commands inside braced conditions and to ensure closed braced arguments do not change context. Also add Linux-specific launch and task configurations to IDE settings to simplify local extension development and debugging. - Recursively scan inner context when a braced body is unfinished - Add tests for nested commands and closed-brace behavior - Add Linux launch/task entries for easier development	2026-09-08 21:16:58 +02:00
Christoph	d104906508	Update version to 2026.9.210	2026-09-04 11:46:55 +00:00
Christoph	a5ff3b55ff	Merge pull request 'feat(syntax): add escaped-quoted-strings token to def syntax' (#35 ) from new_completions into main build_and_puplish.yml / build_and_publish (release) Successful in 7m35s Details Reviewed-on: #35	2026-09-04 11:39:08 +00:00
Christoph Brandau	26225eb8ed	feat(syntax): add escaped-quoted-strings token to def syntax Introduces an escaped-quoted-strings pattern for the def syntax. It enables proper highlighting of strings with escapes and vars. The change adds the new pattern to the syntax and fixes the EOF newline. - Adds escaped-quoted-strings for escapes and embedded vars - Registers new pattern in repository for proper highlighting - Ensures trailing newline in the file	2026-09-04 08:39:46 +02:00
Christoph	844138b383	Update version to 2026.9.200 build_and_puplish.yml / build_and_publish (release) Canceled after 33s Details	2026-09-03 08:39:22 +00:00