Remove Rename UI in favor of new WorkspaceEdit Preview API (#5133)

microsoft · Apr 1, 2020 · 289562e · 289562e
1 parent 873775a
commit 289562e
Show file tree

Hide file tree

Showing 24 changed files with 424 additions and 1,265 deletions.
diff --git a/Extension/.vscode/launch.json b/Extension/.vscode/launch.json
@@ -77,13 +77,13 @@
 			"preLaunchTask": "TypeScript Compile Watch",
 		},
 		{
-			"name": "Launch Tests",
+			"name": "Launch Unit Tests",
 			"type": "extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/unitTests"
+				"--extensionTestsPath=${workspaceFolder}/out/test/unitTests/index"
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
@@ -92,12 +92,6 @@
 			],
 			"preLaunchTask": "Pretest"
 		},
-		{
-			"name": "Node Attach",
-			"type": "node",
-			"request": "attach",
-			"port": 5858
-		},
 		{
 			"name": "Launch Integration Tests",
 			"type": "extensionHost",
@@ -106,14 +100,14 @@
 			"args": [
 				"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer"
+				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer/index"
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"
 			],
-			"preLaunchTask": "Pretest"
+			"preLaunchTask": "Pretest",
 		},
 		{
 			"name": "Launch E2E IntelliSense features tests",
@@ -123,7 +117,7 @@
 			"args": [
 				"C:/git/Vcls-vscode-test/SingleRootProject",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/IntelliSenseFeatures"
+				"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/IntelliSenseFeatures/index"
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
@@ -132,5 +126,11 @@
 			],
 			"preLaunchTask": "Pretest"
 		},
+		{
+			"name": "Node Attach",
+			"type": "node",
+			"request": "attach",
+			"port": 5858
+		},
 	]
 }
diff --git a/Extension/gulpfile.js b/Extension/gulpfile.js
@@ -6,9 +6,7 @@
 'use strict';
 
 const gulp = require('gulp');
-const env = require('gulp-env')
 const eslint = require('gulp-eslint');
-const mocha = require('gulp-mocha');
 const fs = require('fs');
 const nls = require('vscode-nls-dev');
 const path = require('path');
@@ -52,39 +50,13 @@ const languages = [
     { id: "pl", folderName: "plk" }
 ];
 
-gulp.task('unitTests', (done) => {
-    env.set({
-            CODE_TESTS_PATH: "./out/test/unitTests",
-        });
-
-    return gulp.src('./test/runVsCodeTestsWithAbsolutePaths.js', {read: false})
-        .pipe(mocha({ ui: "tdd" }))
-        .once('error', err => {
-            done();
-            process.exit(1);
-        })
-        .once('end', () => {
-            done();
-            process.exit();
-        });
-});
-
 /// Misc Tasks
 const allTypeScript = [
     'src/**/*.ts',
     '!**/*.d.ts',
     '!**/typings**'
 ];
 
-const lintReporter = (output, file, options) => {
-    //emits: src/helloWorld.c:5:3: warning: implicit declaration of function ‘prinft’
-    let relativeBase = file.base.substring(file.cwd.length + 1).replace('\\', '/');
-    output.forEach(e => {
-        let message = relativeBase + e.name + ':' + (e.startPosition.line + 1) + ':' + (e.startPosition.character + 1) + ': ' + e.failure;
-        console.log('[lint] ' + message);
-    });
-};
-
 gulp.task('lint', function () {
     return gulp.src(allTypeScript)
         .pipe(eslint({ configFile: ".eslintrc.js" }))

diff --git a/Extension/jobs/build.windows.yml b/Extension/jobs/build.windows.yml
@@ -37,14 +37,9 @@ jobs:
     displayName: 'Run unit tests'
     workingDirectory: '$(Build.SourcesDirectory)\Extension'
 
-  - script: 'node node_modules/vscode/bin/test'
+  - script: 'yarn run integrationTests'
     displayName: 'Run languageServer integration tests'
-    workingDirectory: '$(Build.SourcesDirectory)\Extension'
-    env:
-      CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\languageServer'
-      CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension'
-      CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject'
-      CODE_DISABLE_EXTENSIONS: 1
+    workingDirectory: '$(Build.SourcesDirectory)/Extension'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'

diff --git a/Extension/jobs/build.yml b/Extension/jobs/build.yml
@@ -41,16 +41,14 @@ jobs:
   - script: 'yarn run unitTests'
     displayName: 'Run unit tests'
     workingDirectory: '$(Build.SourcesDirectory)/Extension'
+    env:
+      DISPLAY: :10
 
-  - script: 'node node_modules/vscode/bin/test'
+  - script: 'yarn run integrationTests'
     displayName: 'Run languageServer integration tests'
     workingDirectory: '$(Build.SourcesDirectory)/Extension'
     env:
       DISPLAY: :10
-      CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/languageServer'
-      CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension'
-      CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject'
-      CODE_DISABLE_EXTENSIONS: 1
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'