Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 19 commits into from
Apr 1, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5d1cc2d
Work in progress
Colengms Mar 16, 2020
665dc10
Work in progress
Colengms Mar 16, 2020
a7f383f
Remove Rename UI in favor of new WorkspaceEdit preview API
Colengms Mar 16, 2020
0cb3181
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Mar 16, 2020
d7ceb63
Rework how tests are launched
Colengms Mar 17, 2020
aa54014
Fix failing test
Colengms Mar 17, 2020
22768c3
Fix how tests are launched
Colengms Mar 17, 2020
881e313
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Mar 17, 2020
e785db0
Increase mocha test timeouts
Colengms Mar 17, 2020
1ae8f57
Experiment to try to get linux build machine to pass.
Colengms Mar 17, 2020
a136dbc
Experiment #2 to try to get linux build machine to pass.
Colengms Mar 17, 2020
f9b8b36
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Mar 17, 2020
9037be5
Merge branch 'master' into coleng/use_rename_preview_api
Colengms Mar 17, 2020
fa97831
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Mar 18, 2020
a3b7c76
Fix spacing in new test sources
Colengms Mar 18, 2020
1389b8f
Merge branch 'master' into coleng/use_rename_preview_api
sean-mcmanus Apr 1, 2020
281a838
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Apr 1, 2020
29c4320
Merge branch 'coleng/use_rename_preview_api' of https://github.com/mi…
Colengms Apr 1, 2020
ab5945f
Address PR feedback
Colengms Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Extension/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -92,12 +92,6 @@
],
"preLaunchTask": "Pretest"
},
{
"name": "Node Attach",
"type": "node",
"request": "attach",
"port": 5858
},
{
"name": "Launch Integration Tests",
"type": "extensionHost",
Expand All @@ -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",
Expand All @@ -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,
Expand All @@ -132,5 +126,11 @@
],
"preLaunchTask": "Pretest"
},
{
"name": "Node Attach",
"type": "node",
"request": "attach",
"port": 5858
},
]
}
28 changes: 0 additions & 28 deletions Extension/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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" }))
Expand Down
9 changes: 2 additions & 7 deletions Extension/jobs/build.windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 3 additions & 5 deletions Extension/jobs/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading