vscode ver > 1.38

.appveyor.yml

@@ -6,11 +6,11 @@ platform:
 
 environment:
  C2_DEBUG: true
- nodejs_version: "10"
+ nodejs_version: '10'
 
  matrix:
- - VSCODE_VERSION: "latest"
- #- VSCODE_VERSION: "1.31.0" appveyor is too slow and we have similar tests using travis
+ - VSCODE_VERSION: 'latest'
+ #- VSCODE_VERSION: "1.38.0" appveyor is too slow and we have similar tests using travis
 
 install:
  - ps: Install-Product node $env:nodejs_version

.travis.yml

@@ -46,10 +46,10 @@ jobs:
  env: VSCODE_VERSION=latest
 
  - os: linux
- env: VSCODE_VERSION=1.31.0
+ env: VSCODE_VERSION=1.38.0
  if: branch = master
  - os: osx
- env: VSCODE_VERSION=1.31.0
+ env: VSCODE_VERSION=1.38.0
  if: branch = master
 
  - os: linux

package.json

@@ -97,7 +97,7 @@
  "webpack-cli": "^3.3.11"
  },
  "engines": {
- "vscode": "^1.23.0"
+ "vscode": "^1.38.0"
  },
  "activationEvents": [
  "onView:test-explorer",

src/Configurations.ts

@@ -132,27 +132,37 @@ export class Configurations {
  // NOTE: update is async operation
  // This is not the nicest solution but should work and simple.
 
- this._new
- .update(newName, oldVals.globalValue, vscode.ConfigurationTarget.Global)
- .then(undefined, e => this._log.exceptionS(e));
- this._new
- .update(newName, oldVals.workspaceValue, vscode.ConfigurationTarget.Workspace)
- .then(undefined, e => this._log.exceptionS(e));
- this._new
- .update(newName, oldVals.workspaceFolderValue, vscode.ConfigurationTarget.WorkspaceFolder)
- .then(undefined, e => this._log.exceptionS(e));
-
  const oldVal = this._old.get<T>(oldName);
 
- this._old
- .update(oldName, undefined, vscode.ConfigurationTarget.Global)
- .then(undefined, e => this._log.exceptionS(e));
- this._old
- .update(oldName, undefined, vscode.ConfigurationTarget.Workspace)
- .then(undefined, e => this._log.exceptionS(e));
- this._old
- .update(oldName, undefined, vscode.ConfigurationTarget.WorkspaceFolder)
- .then(undefined, e => this._log.exceptionS(e));
+ if (oldVals.globalValue !== undefined)
+ this._new
+ .update(newName, oldVals.globalValue, vscode.ConfigurationTarget.Global)
+ .then(undefined, e => this._log.exceptionS(e));
+
+ if (oldVals.workspaceValue !== undefined)
+ this._new
+ .update(newName, oldVals.workspaceValue, vscode.ConfigurationTarget.Workspace)
+ .then(undefined, e => this._log.exceptionS(e));
+
+ if (oldVals.workspaceFolderValue !== undefined)
+ this._new
+ .update(newName, oldVals.workspaceFolderValue, vscode.ConfigurationTarget.WorkspaceFolder)
+ .then(undefined, e => this._log.exceptionS(e));
+
+ if (oldVals.globalValue !== undefined)
+ this._old
+ .update(oldName, undefined, vscode.ConfigurationTarget.Global)
+ .then(undefined, e => this._log.exceptionS(e));
+
+ if (oldVals.workspaceValue !== undefined)
+ this._old
+ .update(oldName, undefined, vscode.ConfigurationTarget.Workspace)
+ .then(undefined, e => this._log.exceptionS(e));
+
+ if (oldVals.workspaceFolderValue !== undefined)
+ this._old
+ .update(oldName, undefined, vscode.ConfigurationTarget.WorkspaceFolder)
+ .then(undefined, e => this._log.exceptionS(e));
 
  return oldVal;
  } else {

test/Configurations.test.ts

@@ -40,6 +40,7 @@ describe(path.basename(__filename), function () {
  });
 
  it('discovery.gracePeriodForMissing', function () {
+ this.timeout(10000);
  return settings.updateConfig('discovery.gracePeriodForMissing', 9876).then(function () {
  assert.equal((adapter as any) /* eslint-disable-line */._shared.execWatchTimeout, 9876000);
  });

test/ExecutablesVariable.test.ts

@@ -100,6 +100,7 @@ describe(path.basename(__filename), function () {
 
  specify('resolving relative defaultCwd', async function () {
  this.slow(1000);
+ this.timeout(10000);
  await settings.updateConfig('test.executables', example1.suite1.execPath);
  await settings.updateConfig('test.workingDirectory', 'defaultCwdStr');