Merge branch 'daimor-master'

Author: Kenneth Shepherd

.github/main.workflow

@@ -1,6 +1,6 @@
 workflow "Build, Lint and Package" {
   on = "push"
-  resolves = ["Package", "Lint"]
+  resolves = ["Package"]
 }
 
 action "Build" {
@@ -9,13 +9,19 @@ action "Build" {
 }
 
 action "Lint" {
-  needs = "Build"
+  needs = ["Build"]
   uses = "actions/npm@master"
-  args = "lint"
+  args = "run lint"
+}
+
+action "Test" {
+  needs = ["Build"]
+  uses = "actions/npm@master"
+  args = "test"
 }
 
 action "Package" {
-  needs = "Build"
+  needs = ["Test", "Lint"]
   uses = "actions/npm@master"
-  args = "package"
+  args = "run package"
 }

.vscode/launch.json

@@ -12,6 +12,15 @@
       "sourceMaps": true,
       "outFiles": ["${workspaceRoot}/out/**/*.js"],
       "preLaunchTask": "npm"
+    },
+    {
+      "name": "Extension Tests",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test"],
+      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+      "preLaunchTask": "npm"
     }
   ]
 }

package-lock.json

@@ -455,16 +455,18 @@
     }
   },
   "scripts": {
-    "vscode:prepublish": "tsc -p ./",
+    "vscode:prepublish": "npm run compile",
     "package": "vsce package",
     "compile": "tsc -p ./",
     "watch": "tsc -w -p ./tsconfig.json",
-    "lint": "tslint --project tsconfig.json -t verbose",
+    "test": "npm run compile && node ./node_modules/vscode/bin/test",
+    "lint": "node ./node_modules/tslint/bin/tslint --project tsconfig.json -t verbose",
     "lint-fix": "tslint --project tsconfig.json -t verbose --fix",
     "postinstall": "node ./node_modules/vscode/bin/install"
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
+    "@types/mocha": "^5.2.5",
     "@types/node": "^10.12.15",
     "eslint": "^5.10.0",
     "tape": "^4.9.1",
@@ -476,6 +478,7 @@
   },
   "dependencies": {
     "bottleneck": "^2.16.2",
-    "glob": "^7.1.3"
+    "glob": "^7.1.3",
+    "vscode-cache": "^0.3.0"
   }
 }

package.json

@@ -18,7 +18,7 @@ export class ObjectScriptDefinitionProvider implements vscode.DefinitionProvider
       return fromClassRef;
     }
 
-    let selfRef = document.getWordRangeAtPosition(position, /\.\.#?%?[a-zA-Z][a-zA-Z0-9]+(?:\.[a-zA-Z][a-zA-Z0-9]+)*/);
+    let selfRef = document.getWordRangeAtPosition(position, /\.\.#?%?[a-zA-Z][a-zA-Z0-9]+/);
     if (selfRef) {
       let selfEntity = document.getText(selfRef).substr(2);
       let range = new vscode.Range(position.line, selfRef.start.character + 2, position.line, selfRef.end.character);

providers/ObjectScriptDefinitionProvider.ts

@@ -0,0 +1,15 @@
+import * as assert from 'assert';
+
+// You can import and use all API from the 'vscode' module
+// as well as import your extension to test it
+// import * as vscode from 'vscode';
+// import * as myExtension from '../extension';
+
+// Defines a Mocha test suite to group tests of similar kind together
+suite('Extension Tests', function() {
+  // Defines a Mocha unit test
+  test('Something 1', function() {
+    assert.equal(-1, [1, 2, 3].indexOf(5));
+    assert.equal(-1, [1, 2, 3].indexOf(0));
+  });
+});

test/extension.test.ts

@@ -0,0 +1,23 @@
+//
+// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
+//
+// This file is providing the test runner to use when running extension tests.
+// By default the test runner in use is Mocha based.
+//
+// You can provide your own test runner if you want to override it by exporting
+// a function run(testRoot: string, clb: (error:Error) => void) that the extension
+// host can call to run the tests. The test runner is expected to use console.log
+// to report the results back to the caller. When the tests are finished, return
+// a possible error to the callback or null if none.
+
+import * as testRunner from 'vscode/lib/testrunner';
+
+// You can directly control Mocha options by configuring the test runner below
+// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options
+// for more info
+testRunner.configure({
+  ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.)
+  useColors: true // colored output from test results
+});
+
+module.exports = testRunner;

test/index.ts

@@ -8,5 +8,5 @@
     "sourceMap": true,
     "rootDir": "."
   },
-  "exclude": ["node_modules", ".vscode-test", "test"]
+  "exclude": ["node_modules", ".vscode-test"]
 }