RonanHeaney
diff --git a/‎.editorconfig‎
Lines changed: 1 addition & 0 deletions b/‎.editorconfig‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 5 additions & 2 deletions b/‎.gitignore‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎.jshintignore‎
Lines changed: 0 additions & 1 deletion b/‎.jshintignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.jshintrc‎
Lines changed: 0 additions & 10 deletions b/‎.jshintrc‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎.travis.yml‎
Lines changed: 1 addition & 0 deletions b/‎.travis.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.vscode/launch.json‎
Lines changed: 29 additions & 40 deletions b/‎.vscode/launch.json‎
Lines changed: 29 additions & 40 deletions
diff --git a/‎.vscode/settings.json‎
Lines changed: 4 additions & 1 deletion b/‎.vscode/settings.json‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎.vscode/tasks.json‎
Lines changed: 12 additions & 0 deletions b/‎.vscode/tasks.json‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎gulpfile.js‎
Lines changed: 9 additions & 8 deletions b/‎gulpfile.js‎
Lines changed: 9 additions & 8 deletions
@@ -8,6 +8,7 @@ root = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+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
 
@@ -2,7 +2,10 @@
 out
 node_modules
 *.pyc
-.vscode/.ropeproject/**
-src/test/.vscode/**
+**/.vscode/.ropeproject/**
 **/testFiles/**/.cache/**
 *.noseids
+.vscode-test
+__pycache__
+npm-debug.log
+**/.mypy_cache/**
@@ -48,6 +48,7 @@ before_install: |
  pyenv install $PYTHON
  pyenv global $PYTHON
  fi
+ export TRAVIS_PYTHON_PATH=`which python`
 install:
  - pip install --upgrade -r requirements.txt
  - npm install
 
@@ -1,25 +1,7 @@
 // A launch configuration that compiles the extension and then opens it inside a new window
 {
 "version": "0.1.0",
-"configurations": [{
-"name": "CompletionServer.ppy",
-"type": "python",
-"request": "launch",
-"stopOnEntry": true,
-"pythonPath": "python",
-"program": "${workspaceRoot}/pythonFiles/completionServer.py",
-"cwd": "${workspaceRoot}",
-"env": {},
-"args": [
-"123"
-],
-"envFile": "${workspaceRoot}/.env",
-"debugOptions": [
-"WaitOnAbnormalExit",
-"WaitOnNormalExit",
-"RedirectOutput"
-]
-},
+"configurations": [
 {
 "name": "Launch Extension",
 "type": "extensionHost",
@@ -30,7 +12,9 @@
 ],
 "stopOnEntry": false,
 "sourceMaps": true,
-"outDir": "${workspaceRoot}/out",
+"outFiles": [
+"${workspaceRoot}/out/**/*.js"
+],
 "preLaunchTask": "compile"
 },
 {
@@ -43,7 +27,9 @@
 "--server=4711"
 ],
 "sourceMaps": true,
-"outDir": "${workspaceRoot}/out/client",
+"outFiles": [
+"${workspaceRoot}/out/client/**/*.js"
+],
 "cwd": "${workspaceRoot}"
 },
 {
@@ -58,33 +44,36 @@
 ],
 "stopOnEntry": false,
 "sourceMaps": true,
-"xxoutDir": "${workspaceRoot}/out/test",
 "outFiles": [
 "${workspaceRoot}/out/**/*.js"
 ],
 "preLaunchTask": "compile"
 },
 {
-"name": "Python",
-"type": "python",
+"name": "Launch Multiroot Tests",
+"type": "extensionHost",
 "request": "launch",
-"stopOnEntry": true,
-"pythonPath": "python",
-"program": "${file}",
-"console": "integratedTerminal",
-"args": [],
-"debugOptions": [
-"WaitOnAbnormalExit",
-"WaitOnNormalExit",
-"RedirectOutput"
+"runtimeExecutable": "${execPath}",
+"args": [
+"${workspaceRoot}/src/testMultiRootWkspc/multi.code-workspace",
+"--extensionDevelopmentPath=${workspaceRoot}",
+"--extensionTestsPath=${workspaceRoot}/out/test"
 ],
-"cwd": "${workspaceRoot}"
+"stopOnEntry": false,
+"sourceMaps": true,
+"outFiles": [
+"${workspaceRoot}/out/**/*.js"
+],
+"preLaunchTask": "compile"
 }
 ],
-"compounds": [{
-"name": "Extension + Debugger",
-"configurations": [
-"Launch Extension", "Launch Extension as debugServer"
-]
-}]
+"compounds": [
+{
+"name": "Extension + Debugger",
+"configurations": [
+"Launch Extension",
+"Launch Extension as debugServer"
+]
+}
+]
 }
@@ -4,7 +4,10 @@
 "out": true, // set this to true to hide the "out" folder with the compiled JS files
 "**/*.pyc": true,
 "**/__pycache__": true,
-"node_modules": true
+"node_modules": true,
+".vscode-test": true,
+"**/.mypy_cache/**": true,
+"**/.ropeproject/**": true
 },
 "search.exclude": {
 "out": true // set this to false to include "out" folder in search results
 
@@ -53,6 +53,18 @@
  "fileLocation": "relative"
  }
  ]
+ },
+ {
+ "label": "lint-staged",
+ "type": "npm",
+ "script": "lint-staged",
+ "problemMatcher": [
+ "$tsc",
+ {
+ "base": "$tslint5",
+ "fileLocation": "relative"
+ }
+ ]
  }
  ]
 }
@@ -80,7 +80,7 @@ function reportFailures(failures) {
  const line = position.lineAndCharacter ? position.lineAndCharacter.line : position.line;
  const character = position.lineAndCharacter ? position.lineAndCharacter.character : position.character;
 
- // Output in format similar to tslint for the linter to pickup
+ // Output in format similar to tslint for the linter to pickup.
  console.error(`ERROR: (${failure.ruleName}) ${relative(__dirname, name)}[${line + 1}, ${character + 1}]: ${failure.failure}`);
  });
 }
@@ -103,9 +103,9 @@ const hygiene = exports.hygiene = (some, options) => {
  .split(/\r\n|\r|\n/)
  .forEach((line, i) => {
  if (/^\s*$/.test(line)) {
- // empty or whitespace lines are OK
+ // Empty or whitespace lines are OK.
  } else if (/^(\s\s\s\s)+.*/.test(line)) {
- // good indent
+ // Good indent.
  } else if (/^[\t]+.*/.test(line)) {
  console.error(file.relative + '(' + (i + 1) + ',1): Bad whitespace indentation');
  errorCount++;
@@ -118,9 +118,10 @@ const hygiene = exports.hygiene = (some, options) => {
  const formatting = es.map(function (file, cb) {
  tsfmt.processString(file.path, file.contents.toString('utf8'), {
  verify: true,
- tsfmt: true,
- editorconfig: true
- // verbose: true
+ tsconfig: true,
+ tslint: true,
+ editorconfig: true,
+ tsfmt: true
  }).then(result => {
  if (result.error) {
  console.error(result.message);
@@ -176,7 +177,7 @@ const hygiene = exports.hygiene = (some, options) => {
  console.error(error.message);
  },
  finish: function () {
- // forget the summary
+ // forget the summary.
  }
  };
  }
@@ -213,7 +214,7 @@ const hygiene = exports.hygiene = (some, options) => {
 
 gulp.task('hygiene', () => hygiene());
 
-// this allows us to run hygiene as a git pre-commit hook
+// this allows us to run hygiene as a git pre-commit hook.
 if (require.main === module) {
  const cp = require('child_process');
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,18 @@`
`53`	`53`	`"fileLocation": "relative"`
`54`	`54`	`}`
`55`	`55`	`]`
	`56`	`+ },`
	`57`	`+ {`
	`58`	`+ "label": "lint-staged",`
	`59`	`+ "type": "npm",`
	`60`	`+ "script": "lint-staged",`
	`61`	`+ "problemMatcher": [`
	`62`	`+ "$tsc",`
	`63`	`+ {`
	`64`	`+ "base": "$tslint5",`
	`65`	`+ "fileLocation": "relative"`
	`66`	`+ }`
	`67`	`+ ]`
`56`	`68`	`}`
`57`	`69`	`]`
`58`	`70`	`}`