Merge pull request #402 from buehler/develop

Release

.appveyor.yml

@@ -1,18 +1,28 @@
-version: "{build} - {branch}"
+version: "{branch} - {build}"
 skip_tags: true
 skip_branch_with_pr: true
 
+matrix:
+  fast_finish: true
+
 environment:
   nodejs_version: "9"
-  CODE_TESTS_WORKSPACE: "$(APPVEYOR_BUILD_FOLDER)/test/etc/workspace_1"
-  CODE_TESTS_PATH: "$(APPVEYOR_BUILD_FOLDER)/out/test/single-workspace"
+  CODE_TESTS_PATH: "$(APPVEYOR_BUILD_FOLDER)/out/test/tests"
+
+  matrix:
+    - CODE_TESTS_WORKSPACE: "$(APPVEYOR_BUILD_FOLDER)/test/etc/workspace_1"
+      YARN_CMD: "test:single-workspace"
+    - CODE_TESTS_WORKSPACE: "$(APPVEYOR_BUILD_FOLDER)/test/etc/multi-root.code-workspace"
+      YARN_CMD: "test:multi-workspace"
 
 install:
   - ps: Install-Product node $env:nodejs_version
   - npm install -g yarn
   - yarn install
 
 test_script:
-  - yarn test
+  - yarn %YARN_CMD%
+  - npm install -g codecov
+  - codecov
 
 build: off

.gitignore

@@ -6,4 +6,5 @@ node_modules
 # Logs
 logs
 *.log
-npm-debug.log*
+npm-debug.log*
+coverage/

.travis.yml

@@ -7,6 +7,9 @@ stages:
   - name: deploy
     if: branch = master AND type != pull_request
 
+matrix:
+  fast_finish: true
+
 notifications:
   email: false
 
@@ -19,7 +22,43 @@ jobs:
       sudo: required
       env:
         - CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/etc/workspace_1
-        - CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/single-workspace
+        - CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/tests
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-4.9
+            - g++-4.9
+            - gcc-4.9-multilib
+            - g++-4.9-multilib
+            - zip
+            - libgtk2.0-0
+            - libx11-dev
+            - libxkbfile-dev
+            - libsecret-1-dev
+      before_install:
+        - export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
+        - sh -e /etc/init.d/xvfb start
+        - sleep 3
+        - yarn global add greenkeeper-lockfile@1
+      install:
+        - yarn install
+      before_script:
+        - greenkeeper-lockfile-update
+      script:
+        - yarn test:single-workspace
+      after_script:
+        - greenkeeper-lockfile-upload
+      after_success:
+        - npm i -g codecov
+        - codecov
+    - stage: test
+      os: linux
+      sudo: required
+      env:
+        - CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/etc/multi-root.code-workspace
+        - CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/tests
       addons:
         apt:
           sources:
@@ -44,30 +83,16 @@ jobs:
       before_script:
         - greenkeeper-lockfile-update
       script:
-        - yarn test --silent
+        - yarn test:multi-workspace
       after_script:
         - greenkeeper-lockfile-upload
+      after_success:
+        - npm i -g codecov
+        - codecov
     - stage: deploy
       install:
         - yarn install
       before_script:
         - yarn build
       script:
         - semantic-release
-
-#- github_changelog_generator --no-verbose -u buehler -p typescript-hero --enhancement-labels "enhancement,feature" --include-labels "bug,enhancement,feature" --future-release $(node -p "require('./package.json').version")
-
-# 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
-
-# OSX Build. which takes a billon years to complete.
-# - stage: test
-#   os: osx
-#   sudo: false
-#   env:
-#     - CODE_TESTS_WORKSPACE=$TRAVIS_BUILD_DIR/test/_workspace
-#     - CODE_TESTS_PATH=$TRAVIS_BUILD_DIR/out/test/single-workspace-tests
-#   install:
-#     - yarn install
-#   script:
-#     - yarn test --silent

.vscode/launch.json

@@ -43,17 +43,22 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "${workspaceRoot}/test/_workspace",
+        "${workspaceRoot}/test/etc/workspace_1",
         "--extensionDevelopmentPath=${workspaceRoot}",
-        "--extensionTestsPath=${workspaceRoot}/out/test/single-workspace-tests/"
+        "--extensionTestsPath=${workspaceRoot}/out/test/tests/"
       ],
       "env": {
-        "CI": "true"
+        "EXT_DEBUG": "true",
+        "LOCAL_TEST": "true",
+        "COVERAGE": "true",
+        "CHAI_JEST_SNAPSHOT_UPDATE_ALL": "true"
       },
       "stopOnEntry": false,
       "sourceMaps": true,
+      "smartStep": true,
       "outFiles": [
-        "${workspaceRoot}/out/test/single-workspace-tests/**/*.js"
+        "${workspaceRoot}/out/src/**/*.js",
+        "${workspaceRoot}/out/test/tests/**/*.js"
       ]
     },
     {
@@ -62,17 +67,22 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "${workspaceRoot}/test/multi-root.code-workspace",
+        "${workspaceRoot}/test/etc/multi-root.code-workspace",
         "--extensionDevelopmentPath=${workspaceRoot}",
-        "--extensionTestsPath=${workspaceRoot}/out/test/multi-root-workspace-tests/"
+        "--extensionTestsPath=${workspaceRoot}/out/test/tests/"
       ],
       "env": {
-        "CI": "true"
+        "EXT_DEBUG": "true",
+        "LOCAL_TEST": "true",
+        "COVERAGE": "true",
+        "CHAI_JEST_SNAPSHOT_UPDATE_ALL": "true"
       },
       "stopOnEntry": false,
       "sourceMaps": true,
+      "smartStep": true,
       "outFiles": [
-        "${workspaceRoot}/out/test/**/*.js"
+        "${workspaceRoot}/out/src/**/*.js",
+        "${workspaceRoot}/out/test/tests/**/*.js"
       ]
     }
   ],

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "editor.tabSize": 4
+  "editor.tabSize": 2
 }

.vscodeignore

@@ -12,6 +12,9 @@ src/**
 !src/extension/assets/**
 tsconfig.json
 tslint.json
+coverage/**
+
+__snapshots__/**
 
 *.vsix
 out/test/**

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 smartive
+Copyright (c) 2018 Christoph Bühler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.