Merge pull request #63 from SSlinky/dev

Scopes reimplementation

Author: SSlinky

.eslintignore

@@ -1,16 +1,15 @@
-#Out file is required by command
-#`npm run textMate`, so a placeholder is included in client/out to ensure `out`
-#folder is available
-**/out/*
-!client/out/*.tmp
-client/src/syntaxes/dev*
+# Generated files.
+dist/*
+**/antlr/*/
+*.vsix
+*.tsbuildinfo
+*.log
 
-.antlr
+# Resources
 node_modules
-client/server
+sample*/**
 template*
+
+# Workspace settings
 .vscode-test
-sample*/**
-*.vsix
-*.tsbuildinfo
-*.log
+.vscode/settings.json

.eslintrc.js

@@ -13,7 +13,7 @@
 			],
 			"preLaunchTask": {
 				"type": "npm",
-				"script": "compile"
+				"script": "build"
 			}
 		},
 		{

.gitignore

@@ -498,7 +498,7 @@
               "repository": {
                 "onErrorStatement": {
                   "name": "meta.onErrorStatement.vba",
-                  "match": "(?i)\\b(on\\s+error)\\s+(?:(resume\\s+next)|(goto)\\s+([a-z0-9]+))",
+                  "match": "(?i)\\b(on\\s+error)\\s+(?:(resume\\s+next)|(goto)\\s+([a-z0-9_]+))",
                   "captures": {
                     "1": {
                       "name": "keyword.control.flow.jump.vba"
@@ -549,7 +549,7 @@
                       "include": "#literals"
                     },
                     {
-                      "match": "(?i)([a-z][a-z0-9]*)",
+                      "match": "(?i)([a-z][a-z0-9_]*)",
                       "name": "variable.other.constant.label.vba"
                     }
                   ]
@@ -819,7 +819,7 @@
     },
     "argumentSignatureFromParam": {
       "name": "meta.argument-signature.param.vba",
-      "begin": "(?i)[a-z][a-z0-9]*(\\(\\))?",
+      "begin": "(?i)[a-z][a-z0-9_]*(\\(\\))?",
       "end": "(?=[,):'\\n])",
       "beginCaptures": {
         "0": {

.vscode/launch.json

@@ -324,7 +324,7 @@ repository:
             repository:
               onErrorStatement:
                 name: meta.onErrorStatement.vba
-                match: (?i)\b(on\s+error)\s+(?:(resume\s+next)|(goto)\s+([a-z0-9]+))
+                match: (?i)\b(on\s+error)\s+(?:(resume\s+next)|(goto)\s+([a-z0-9_]+))
                 captures:
                   1:
                     name: keyword.control.flow.jump.vba
@@ -353,7 +353,7 @@ repository:
                 patterns:
                   - include: "#separator"
                   - include: "#literals"
-                  - match: (?i)([a-z][a-z0-9]*)
+                  - match: (?i)([a-z][a-z0-9_]*)
                     name: variable.other.constant.label.vba
               goToGoSubReturnStatement:
                 name: meta.goToGoSubReturnStatement.vba
@@ -512,7 +512,7 @@ repository:
 
   argumentSignatureFromParam:
     name: meta.argument-signature.param.vba
-    begin: (?i)[a-z][a-z0-9]*(\(\))?
+    begin: (?i)[a-z][a-z0-9_]*(\(\))?
     end: (?=[,):'\n])
     beginCaptures:
       0:

.vscode/settings.json

@@ -0,0 +1,61 @@
+// // eslint.config.js
+// import js from '@eslint/js';
+// import ts from '@typescript-eslint/eslint-plugin';
+// import parser from '@typescript-eslint/parser';
+
+// export default [
+//   js.configs.recommended,
+//   {
+//     files: ['**/*.ts', '**/*.tsx'],
+//     languageOptions: {
+//       parser,
+//     },
+//     plugins: {
+//       '@typescript-eslint': ts,
+//     },
+//     rules: {
+//       semi: ['error', 'always'],
+//       '@typescript-eslint/no-unused-vars': 'off',
+//       '@typescript-eslint/no-explicit-any': 'off',
+//       '@typescript-eslint/explicit-module-boundary-types': 'off',
+//       '@typescript-eslint/no-non-null-assertion': 'off',
+//     },
+//   },
+// ];
+
+// eslint.config.js
+import js from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import parser from '@typescript-eslint/parser';
+
+export default [
+	js.configs.recommended,
+	...tseslint.configs.recommended,
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		languageOptions: {
+			parser,
+			parserOptions: {
+				ecmaVersion: 'latest',
+				sourceType: 'module',
+			},
+		},
+		rules: {
+			semi: ['error', 'always'],
+			'@typescript-eslint/no-unused-vars': 'off',
+			'@typescript-eslint/no-explicit-any': 'off',
+			'@typescript-eslint/explicit-module-boundary-types': 'off',
+			'@typescript-eslint/no-non-null-assertion': 'off',
+		},
+	},
+	{
+		ignores: [
+			'node_modules/',
+			'client/node_modules/',
+			'client/out/',
+			'server/node_modules/',
+			'server/out/',
+			'server/src/antlr/',
+		],
+	},
+];