Fix local identifier lookup and upgrade OScript parser and walker

Author: prantlf

.vscode/launch.json

@@ -13,6 +13,15 @@
 			"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
 			"sourceMaps": true,
 			"outFiles": ["${workspaceRoot}/dist/extension.js"]
+    },
+    {
+      "name": "Launch Server",
+      "type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/dist/server.js",
+			"args": ["--nolazy", "--inspect=6009"],
+			"sourceMaps": true,
+			"outFiles": ["${workspaceRoot}/dist/server.js"]
     },
 		{
 			"name": "Attach to Server",

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-oscript",
   "displayName": "OScript Language",
   "description": "Provides syntax checking and fixing, highlighting, autocompletion, hints, symbol outline, identifier recognition and renaming and other features for the OScript language in Visual Studio Code.",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "icon": "doc/logo.png",
   "publisher": "prantlf",
   "author": {
@@ -218,13 +218,13 @@
     "@rollup/plugin-commonjs": "17.0.0",
     "@rollup/plugin-node-resolve": "11.0.1",
     "@rollup/plugin-sucrase": "3.1.0",
-    "@types/node": "14.14.19",
+    "@types/node": "14.14.20",
     "@types/vscode": "1.52.0",
-    "@typescript-eslint/eslint-plugin": "4.11.1",
-    "@typescript-eslint/parser": "4.11.1",
+    "@typescript-eslint/eslint-plugin": "4.12.0",
+    "@typescript-eslint/parser": "4.12.0",
     "eslint": "7.17.0",
     "js-yaml": "4.0.0",
-    "rollup": "2.35.1",
+    "rollup": "2.36.1",
     "rollup-plugin-terser": "7.0.2",
     "typescript": "4.1.3",
     "yaml-lint": "1.2.4"

package.json

@@ -6,5 +6,6 @@
     "editor.tabSize": 4,
     "editor.insertSpaces": false,
     "editor.detectIndentation": false
-  }
+  },
+  "oscript.logging.level": "debug"
 }

pkg/api/package-lock.json

@@ -8,6 +8,11 @@ public object Document inherits CORE::Node
 		DAPINODE node = DAPI.GetNodeByID(id, workspace, FALSE)
 		if !IsError(node) and node.pSubType == $Document
 			return node
+		elseif IsError(node)
+			.Clear()
+			return Error(1)
+		else
+			;
 		end
 	end
 
@@ -16,6 +21,14 @@ public object Document inherits CORE::Node
 		Object	item
 
 		for item in cached
+			switch item.type
+				case 144
+					break
+				end
+				default
+					;
+				end
+			end
 		end
 
 		function List GetCache()

pkg/examples/.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "name": "oscript-language-server",
-  "description": "Syntax checking, highlighting, hover hints and other support for the OScript language in Visual Studio Code.",
-  "version": "0.0.3",
+  "description": "A language server for the OScript language.",
+  "version": "0.0.5",
   "author": {
     "name": "Ferdinand Prantl",
     "email": "prantlf@gmail.com",
@@ -34,8 +34,8 @@
   ],
   "devDependencies": {
     "@rollup/plugin-yaml": "3.0.0",
-    "oscript-ast-walker": "0.0.1",
-    "oscript-parser": "0.2.2",
+    "oscript-ast-walker": "0.0.2",
+    "oscript-parser": "0.2.3",
     "rollup-plugin-copy": "3.3.0",
     "vscode-languageserver": "7.0.0",
     "vscode-languageserver-textdocument": "1.0.1"

pkg/examples/object.os

@@ -15,7 +15,7 @@ export function findLocalsInScope (scope: any, node: any): { node: Node, parent:
         // Skip the scope itself, if it has accidentally the same name. Also,
         // skip nested scopes, if they contain a local declaration using the
         // same identifier value.
-        if (scope !== node && !ignoreScope &&
+        if (scope !== parent && !ignoreScope &&
             mayComeFromVariable(node, parent) && node.value === value) {
           results.push({ node, parent })
         }