Merge branch 'develop'

iSorp · Jul 6, 2022 · 8eec2d1 · 8eec2d1
2 parents e37e3ce + a87d029
commit 8eec2d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.4.2  (July 6, 2022)
+- Fix a bug if an undefined symbol crashes the validator
+
 ## 0.4.1  (July 5, 2022)
 - Fix a bug when using custom keywords for semantic highlighting
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "macro-executor",
 	"displayName": "Macro Executor Language",
 	"description": "Fanuc Macro-Executor Programming Language",
-	"version": "0.4.1",
+	"version": "0.4.2",
 	"author": "iSorp",
 	"publisher": "iSorp",
 	"license": "MIT",
@@ -103,6 +103,11 @@
 				"command": "macro.action.addsequeces",
 				"title": "%macro.action.addsequeces%",
 				"category": "Macro"
+			},
+			{
+				"command": "macro.validate.workspace",
+				"title": "%macro.validate.workspace%",
+				"category": "Macro"
 			}
 		],
 		"menus": {

diff --git a/server/src/macroLanguageService/parser/macroNodes.ts b/server/src/macroLanguageService/parser/macroNodes.ts
@@ -573,7 +573,8 @@ export class DefReference extends Reference {
 	}
 
 	public getNonSymbolText(): string {
-		return this.definition?.value?.getText();
+		return this.definition?.value?.getText() ?? ''
+		;
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -573,7 +573,8 @@ export class DefReference extends Reference { @@
     	}
     	public getNonSymbolText(): string {
-    		return this.definition?.value?.getText();
+    		return this.definition?.value?.getText() ?? ''
+    		;
     	}
     }
@@ Expand Down @@