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 = tab
+insert_final_newline = true
+tab_width = 4
+
+# The indent size used in the `package.json` file cannot be changed
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+[{*.yml,*.yaml,package.json}]
+indent_style = space
+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

@@ -5,72 +5,72 @@ import { isUndefined } from 'util';
 
 export default class PeekFileDefinitionProvider implements vscode.DefinitionProvider {
 
-  constructor() {}
+	constructor() {}
 
-  getComponentName(position: vscode.Position): String[] {
-    const doc = vscode.window.activeTextEditor.document;
-    const selection = doc.getWordRangeAtPosition(position);
-    const selectedText = doc.getText(selection);
-    let possibleFileNames = [];
-    possibleFileNames.push(selectedText + '.m');
-    return possibleFileNames;
-  }
+	getComponentName(position: vscode.Position): String[] {
+		const doc = vscode.window.activeTextEditor.document;
+		const selection = doc.getWordRangeAtPosition(position);
+		const selectedText = doc.getText(selection);
+		let possibleFileNames = [];
+		possibleFileNames.push(selectedText + '.m');
+		return possibleFileNames;
+	}
 
-  getNestedFuncPosition(position: vscode.Position): number[] {
-    const doc = vscode.window.activeTextEditor.document;
-    const selection = doc.getWordRangeAtPosition(position);
-    const selectedText = doc.getText(selection);
+	getNestedFuncPosition(position: vscode.Position): number[] {
+		const doc = vscode.window.activeTextEditor.document;
+		const selection = doc.getWordRangeAtPosition(position);
+		const selectedText = doc.getText(selection);
 
-    for (let lineNb = 0; lineNb < doc.lineCount; lineNb ++) {
-      const txtLine = doc.lineAt(lineNb);
-      if (!txtLine.isEmptyOrWhitespace) {
-        const content = txtLine.text;
-        const Colfunc = content.indexOf('function ');
-        const ColName1 = content.indexOf(selectedText + '(');
-        const ColName2 = content.indexOf(selectedText + ' (');
-        if (Colfunc != -1 && (ColName1 != -1 || ColName2 != -1)) {
-          return [lineNb, Colfunc];
-        }
-      }
-    }
-    return [];
-  }
+		for (let lineNb = 0; lineNb < doc.lineCount; lineNb ++) {
+			const txtLine = doc.lineAt(lineNb);
+			if (!txtLine.isEmptyOrWhitespace) {
+				const content = txtLine.text;
+				const Colfunc = content.indexOf('function ');
+				const ColName1 = content.indexOf(selectedText + '(');
+				const ColName2 = content.indexOf(selectedText + ' (');
+				if (Colfunc != -1 && (ColName1 != -1 || ColName2 != -1)) {
+					return [lineNb, Colfunc];
+				}
+			}
+		}
+		return [];
+	}
 
-  searchFilePath(fileName: String): Thenable<vscode.Uri[]> {
-    return vscode.workspace.findFiles(`**/${fileName}`, '**/node_modules'); // Returns promise
-  }
+	searchFilePath(fileName: String): Thenable<vscode.Uri[]> {
+		return vscode.workspace.findFiles(`**/${fileName}`, '**/node_modules'); // Returns promise
+	}
 
-  provideDefinition(
-    document: vscode.TextDocument,
-    position: vscode.Position,
-    token: vscode.CancellationToken
-  ): Promise<vscode.Location | vscode.Location[]> {
-    
-    let filePaths = [];
-    const componentNames = this.getComponentName(position);
-    const searchPathActions = componentNames.map(this.searchFilePath);
-    const searchPromises = Promise.all(searchPathActions); // pass array of promises
-    const posInFile = this.getNestedFuncPosition(position);
-    return searchPromises.then((paths) => {
-      filePaths = [].concat.apply([], paths);
-      if (filePaths.length) {
-        console.log(posInFile)
-        let allPaths = [];
-        filePaths.forEach(filePath => {
-          allPaths.push(new vscode.Location(vscode.Uri.file(`${filePath.path}`),new vscode.Position(0,1) ))
-        });
-        return allPaths;
-      } else {
-        if (posInFile.length) {
-          let allPaths = [];
-          allPaths.push(new vscode.Location(document.uri,new vscode.Position(posInFile[0],posInFile[1])));
-          return allPaths;
-        } else {
-          return undefined;
-        }
-      }
-    }, (reason) => {
-      return undefined;
-    });
-  }
-}
+	provideDefinition(
+		document: vscode.TextDocument,
+		position: vscode.Position,
+		token: vscode.CancellationToken
+	): Promise<vscode.Location | vscode.Location[]> {
+		
+		let filePaths = [];
+		const componentNames = this.getComponentName(position);
+		const searchPathActions = componentNames.map(this.searchFilePath);
+		const searchPromises = Promise.all(searchPathActions); // pass array of promises
+		const posInFile = this.getNestedFuncPosition(position);
+		return searchPromises.then((paths) => {
+			filePaths = [].concat.apply([], paths);
+			if (filePaths.length) {
+				console.log(posInFile)
+				let allPaths = [];
+				filePaths.forEach(filePath => {
+					allPaths.push(new vscode.Location(vscode.Uri.file(`${filePath.path}`),new vscode.Position(0,1) ))
+				});
+				return allPaths;
+			} else {
+				if (posInFile.length) {
+					let allPaths = [];
+					allPaths.push(new vscode.Location(document.uri,new vscode.Position(posInFile[0],posInFile[1])));
+					return allPaths;
+				} else {
+					return undefined;
+				}
+			}
+		}, (reason) => {
+			return undefined;
+		});
+	}
+}