Merge pull request #330 from buehler/develop

Release 2017-10-31

.appveyor.yml

@@ -0,0 +1,18 @@
+version: "{build} - {branch}"
+skip_tags: true
+skip_branch_with_pr: true
+
+environment:
+  nodejs_version: "8"
+  CODE_TESTS_WORKSPACE: "$(APPVEYOR_BUILD_FOLDER)/test/_workspace"
+  CODE_TESTS_PATH: "$(APPVEYOR_BUILD_FOLDER)/out/test/single-workspace-tests"
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install -g yarn
+  - yarn install
+
+test_script:
+  - yarn test
+
+build: off

.travis.yml

@@ -7,13 +7,15 @@ node_js:
 notifications:
   email: false
 
-env:
-  global:
-    - CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/_workspace
-
 os:
   - linux
 
+env:
+  - CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/_workspace CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/single-workspace-tests
+
+# add as soon as multi root workspaces are available:
+#- CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/multi-root.code-workspace CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/multi-root-workspace-tests
+
 addons:
   apt:
     sources:
@@ -32,8 +34,8 @@ addons:
 before_install:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
-      sh -e /etc/init.d/xvfb start; 
-      sleep 3; 
+      sh -e /etc/init.d/xvfb start;
+      sleep 3;
     fi
   - rvm get stable
   - rvm install 2.4
@@ -42,7 +44,7 @@ before_install:
 
 install:
   - yarn install
- 
+
 before_script:
   - greenkeeper-lockfile-update
   - yarn run build

.vscode/launch.json

@@ -10,21 +10,58 @@
                 "${workspaceRoot}/test/_workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}"
             ],
+            "env": {
+                "EXT_DEBUG": "true"
+            },
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
                 "${workspaceRoot}/out/src/**/*.js"
             ]
         },
         {
-            "name": "Launch Tests",
+            "name": "Launch Extension Multi-Root",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceRoot}/test/multi-root.code-workspace",
+                "--extensionDevelopmentPath=${workspaceRoot}"
+            ],
+            "env": {
+                "EXT_DEBUG": "true"
+            },
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/out/src/**/*.js"
+            ]
+        },
+        {
+            "name": "Launch Tests (single Workspace)",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
                 "${workspaceRoot}/test/_workspace",
                 "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test"
+                "--extensionTestsPath=${workspaceRoot}/out/test/single-workspace-tests/"
+            ],
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/out/test/single-workspace-tests/**/*.js"
+            ]
+        },
+        {
+            "name": "Launch Tests (multi-root Workspace)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceRoot}/test/multi-root.code-workspace",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/multi-root-workspace-tests/"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,

README.md

@@ -9,6 +9,7 @@ in the future and there are many features in the pipeline that will enhance the
 work with typescript.
 
 [![Travis build](https://img.shields.io/travis/buehler/typescript-hero.svg)](https://travis-ci.org/buehler/typescript-hero)
+[![AppVeyor status](https://ci.appveyor.com/api/projects/status/p1vbbyh69j4s0rbh?svg=true)](https://ci.appveyor.com/project/buehler/typescript-hero)
 [![Marketplace](https://vsmarketplacebadge.apphb.com/version-short/rbbit.typescript-hero.svg)](https://marketplace.visualstudio.com/items?itemName=rbbit.typescript-hero)
 [![Installs](https://vsmarketplacebadge.apphb.com/installs/rbbit.typescript-hero.svg)](https://marketplace.visualstudio.com/items?itemName=rbbit.typescript-hero)
 [![GitHub issues](https://img.shields.io/github/issues/buehler/typescript-hero.svg)](https://github.com/buehler/typescript-hero/issues)
@@ -71,9 +72,16 @@ All settings are preceeded by `typescriptHero`.
 
 These settings do not have a prefix.
 
+| Setting    | Description                                                                             |
+| ---------- | --------------------------------------------------------------------------------------- |
+| verbosity  | The log level that the extension writes its messages to the output channel and the file |
+
+### Code completion
+
+The following settings do have the prefix `codeCompletion`. So an example setting could be
+`typescriptHero.codeCompletion.completionSortOrder`.
+
 | Setting             | Description                                                                   |
-| ------------------- | ----------------------------------------------------------------------------- |
-| verbosity           | The log level that the extension writes its messages to the output channel    |
 | completionSortOrder | The order of import completions in suggestion list, `bottom` pushes them down |
 
 ### Import resolver

config/tsconfig.base.json

@@ -4,7 +4,8 @@
         "target": "es6",
         "outDir": "../out",
         "lib": [
-            "es6"
+            "es6",
+            "es2017"
         ],
         "rootDir": "..",
         "emitDecoratorMetadata": true,
@@ -20,6 +21,7 @@
         "../test/**/*"
     ],
     "exclude": [
-        "../test/_workspace"
+        "../test/_workspace",
+        "../test/_workspace_2"
     ]
 }

etc/test_install.js

@@ -0,0 +1,8 @@
+const { existsSync } = require('fs');
+const { join } = require('path');
+
+if (existsSync(join(__dirname, '..', 'node_modules', 'vscode', 'bin', 'install'))) {
+    process.exit(0);
+    return;
+}
+process.exit(1);