Add injection grammars for packages, validation and overloads

.editorconfig

@@ -0,0 +1,16 @@
+# Top-most EditorConfig file
+root = true
+
+# Tab indentation
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+[*.xml]
+indent_style = tab
+indent_size = 2

.vscode/tasks.json

@@ -8,23 +8,33 @@
 
 // A task runner that calls a custom npm script that compiles the extension.
 {
-	"version": "0.1.0",
+	"version": "2.0.0",
 
 	// we want to run npm
 	"command": "npm",
 
-	// the command is a shell script
-	"isShellCommand": true,
-
-	// show the output window only if unrecognized errors occur.
-	"showOutput": "silent",
-
 	// we run the custom script "compile" as defined in package.json
 	"args": ["run", "compile", "--loglevel", "silent"],
 
 	// The tsc compiler is started in watching mode
 	"isWatching": true,
 
 	// use the standard tsc in watch mode problem matcher to find compile problems in the output.
-	"problemMatcher": "$tsc-watch"
+	"problemMatcher": "$tsc-watch",
+	"tasks": [
+		{
+			"label": "npm",
+			"type": "shell",
+			"command": "npm",
+			"args": [
+				"run",
+				"compile",
+				"--loglevel",
+				"silent"
+			],
+			"isBackground": true,
+			"problemMatcher": "$tsc-watch",
+			"group": "build"
+		}
+	]
 }

package.json

@@ -2,9 +2,9 @@
   "name": "matlab",
   "displayName": "Matlab",
   "description": "MATLAB support for Visual Studio Code",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "publisher": "Gimly81",
-  "license": "SEE LICENSE IN LICENSE.md",
+  "license": "MIT",
   "engines": {
     "vscode": "^1.16.0"
   },
@@ -48,8 +48,36 @@
         "injectTo": [
           "source.matlab"
         ],
-        "scopeName": "matlab-functions.injection",
-        "path": "./syntaxes/matlab-functions.tmLanguage"
+        "scopeName": "builtin.matlab.injection",
+        "path": "./syntaxes/builtin.matlab.injection.tmLanguage"
+      },
+      {
+        "injectTo": [
+          "source.matlab"
+        ],
+        "scopeName": "overload.matlab.injection",
+        "path": "./syntaxes/overload.matlab.injection.tmLanguage"
+      },
+      {
+        "injectTo": [
+          "source.matlab"
+        ],
+        "scopeName": "package.matlab.injection",
+        "path": "./syntaxes/package.matlab.injection.tmLanguage"
+      },
+      {
+        "injectTo": [
+          "source.matlab"
+        ],
+        "scopeName": "readwrite.matlab.injection",
+        "path": "./syntaxes/readwrite.matlab.injection.tmLanguage"
+      },
+      {
+        "injectTo": [
+          "source.matlab"
+        ],
+        "scopeName": "validation.matlab.injection",
+        "path": "./syntaxes/validation.matlab.injection.tmLanguage"
       }
     ],
     "snippets": [
@@ -101,11 +129,12 @@
     "postinstall": "node ./node_modules/vscode/bin/install"
   },
   "devDependencies": {
-    "typescript": "^2.5.2",
-    "vscode": "^1.1.5",
-    "mocha": "^3.5.0",
+    "@types/mocha": "^2.2.42",
     "@types/node": "^7.0.43",
-    "@types/mocha": "^2.2.42"
+    "@types/vscode": "^1.57.0",
+    "mocha": "^3.5.0",
+    "typescript": "^4.3.5",
+    "vscode-test": "^1.5.2"
   },
   "dependencies": {
     "iconv-lite": "^0.4.19"

src/PeekFileDefinitionProvider.ts

@@ -73,4 +73,4 @@ export default class PeekFileDefinitionProvider implements vscode.DefinitionProv
       return undefined;
     });
   }
-}
+}

src/matlabDiagnostics.ts

@@ -9,71 +9,71 @@ import { ERROR_IDS } from './errorsId';
 import { window } from 'vscode';
 
 export interface ICheckResult {
-	file: string;
-	line: number;
-	column: [number, number];
-	msg: string;
-	severity: string
+  file: string;
+  line: number;
+  column: [number, number];
+  msg: string;
+  severity: string
 }
 
 export function check(document: vscode.TextDocument, lintOnSave = true, mlintPath = ""): Promise<ICheckResult[]> {
-	var matlabLint = !lintOnSave ? Promise.resolve([]) : new Promise((resolve, reject) => {
-		var filename = document.uri.fsPath;
-
-		let matlabConfig = vscode.workspace.getConfiguration('matlab');
-
-		let args: string[] = ['-all', '-id'];
-		if (matlabConfig.has('linterConfig') && matlabConfig['linterConfig'] != null) {
-			args.push(`-config=${matlabConfig['linterConfig']}`);
-		}
-
-		args.push(filename);
-
-		let fileEncoding = 'utf8';
-		if (matlabConfig.has('linterEncoding') && matlabConfig['linterEncoding'] != null) {
-			fileEncoding = matlabConfig['linterEncoding'];
-		}
-
-		cp.execFile(
-			mlintPath,
-			args,
-			{ encoding: 'buffer' },
-			(err: Error, stdout, stderr) => {
-				try {
-					let errorsString = iconv.decode(stderr, fileEncoding);
-
-					var errors = errorsString.split('\n');
-
-					var ret: ICheckResult[] = [];
-
-					errors.forEach(error => {
-						var regex = /L (\d+) \(C (\d+)-?(\d+)?\): (\S+): (.*)/;
-						var match = regex.exec(error);
-
-						if (match != null) {
-							var [_, lineStr, startCol, endCol, idErrorWarn, msg] = match;
-							var line = +lineStr;
-
-							if (endCol == null) {
-								endCol = startCol;
-							}
-
-							if (ERROR_IDS.includes(idErrorWarn)) {
-								ret.push({ file: filename, line, column: [+startCol, +endCol], msg, severity: "error" });
-							}
-							else {
-								ret.push({ file: filename, line, column: [+startCol, +endCol], msg, severity: "warning" });
-							}
-						}
-					});
-
-					resolve(ret);
-				} catch (error) {
-					console.error(error);
-					reject(error);
-				}
-			});
-	});
-
-	return Promise.all([matlabLint]).then(resultSets => [].concat.apply([], resultSets));
+  var matlabLint = !lintOnSave ? Promise.resolve([]) : new Promise((resolve, reject) => {
+    var filename = document.uri.fsPath;
+
+    let matlabConfig = vscode.workspace.getConfiguration('matlab');
+
+    let args: string[] = ['-all', '-id'];
+    if (matlabConfig.has('linterConfig') && matlabConfig['linterConfig'] != null) {
+      args.push(`-config=${matlabConfig['linterConfig']}`);
+    }
+
+    args.push(filename);
+
+    let fileEncoding = 'utf8';
+    if (matlabConfig.has('linterEncoding') && matlabConfig['linterEncoding'] != null) {
+      fileEncoding = matlabConfig['linterEncoding'];
+    }
+
+    cp.execFile(
+      mlintPath,
+      args,
+      { encoding: 'buffer' },
+      (err: Error, stdout, stderr) => {
+        try {
+          let errorsString = iconv.decode(stderr, fileEncoding);
+
+          var errors = errorsString.split('\n');
+
+          var ret: ICheckResult[] = [];
+
+          errors.forEach(error => {
+            var regex = /L (\d+) \(C (\d+)-?(\d+)?\): (\S+): (.*)/;
+            var match = regex.exec(error);
+
+            if (match != null) {
+              var [_, lineStr, startCol, endCol, idErrorWarn, msg] = match;
+              var line = +lineStr;
+
+              if (endCol == null) {
+                endCol = startCol;
+              }
+
+              if (ERROR_IDS.includes(idErrorWarn)) {
+                ret.push({ file: filename, line, column: [+startCol, +endCol], msg, severity: "error" });
+              }
+              else {
+                ret.push({ file: filename, line, column: [+startCol, +endCol], msg, severity: "warning" });
+              }
+            }
+          });
+
+          resolve(ret);
+        } catch (error) {
+          console.error(error);
+          reject(error);
+        }
+      });
+  });
+
+  return Promise.all([matlabLint]).then(resultSets => [].concat.apply([], resultSets));
 }