Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Extension/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_modules

# ignore compliled typescript
out
dist

# ignore downloaded extension files and folders
server
Expand Down
4 changes: 2 additions & 2 deletions Extension/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [
"${workspaceFolder}/out/**/*.js"
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "TypeScript Compile",
"preLaunchTask": "Compile Dev",
},
{
"name": "Launch Tests",
Expand Down
12 changes: 12 additions & 0 deletions Extension/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@
"dependsOn": [
"TypeScript Compile"
]
},
{
"label": "Compile Dev",
"group": "build",
"isBackground": false,
"type": "shell",
"command": "npm",
"args": [
"run",
"compileDev"
],
"problemMatcher": "$tsc-watch"
}
]
}
38 changes: 29 additions & 9 deletions Extension/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,35 @@
obj/**

# ignore vscode settings for extension development
.vscode/**
typings/**
out/test/**

# ignore binaries
obj/**

# ignore source files
tools/**
notices/**
test/**
src/**
**/*.map
.gitignore

# ignore .js files that are webpacked or only used for development
out/src/**
out/tools/**

# ignore ts files in ui
ui/*.ts

# ignore Azure-Pipelines files
jobs/**

# ignore development files
tsconfig.json
tslint.json
webpack.config.js
README.md
gulpfile.js
.gitattributes
.gitignore
CMakeLists.txt
debugAdapters/install.lock*
out/src/Debugger/copyScript.js
tools/**
out/tools/**
notices/**
typings/**
**/*.map
1 change: 0 additions & 1 deletion Extension/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ gulp.task('integrationTests', (done) => {
/// Misc Tasks
const allTypeScript = [
'src/**/*.ts',
'tools/**/*.ts',
'!**/*.d.ts',
'!**/typings**'
];
Expand Down
15 changes: 1 addition & 14 deletions Extension/jobs/build.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@ jobs:
workingDirectory: '$(Build.SourcesDirectory)\Extension'
continueOnError: true

- script: 'copy "$(Build.SourcesDirectory)\Extension\out\test\integrationTests\MockDebugger\debugAdapterDescriptorFactory.js" "$(Build.SourcesDirectory)\Extension\out\src\Debugger\debugAdapterDescriptorFactory.js" /Y'
displayName: Replace Debug Adapter Descriptor Factory

- script: 'node node_modules/vscode/bin/test'
displayName: 'Run debug integration tests'
workingDirectory: '$(Build.SourcesDirectory)\Extension'
continueOnError: true
env:
CODE_TESTS_PATH: '$(Build.SourcesDirectory)\Extension\out\test\integrationTests\debug'
CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)\Extension'
CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)\Extension\test\integrationTests\testAssets\SimpleCppProject'
CODE_DISABLE_EXTENSIONS: 1

- script: 'node node_modules/vscode/bin/test'
displayName: 'Run languageServer integration tests'
workingDirectory: '$(Build.SourcesDirectory)\Extension'
Expand All @@ -59,4 +46,4 @@ jobs:

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
continueOnError: true
continueOnError: true
18 changes: 1 addition & 17 deletions Extension/jobs/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,6 @@ jobs:
disown -ar
displayName: 'Start xvfb'

- script: |
cp $(Build.SourcesDirectory)/Extension/out/test/integrationTests/MockDebugger/debugAdapterDescriptorFactory.js $(Build.SourcesDirectory)/Extension/out/src/Debugger/debugAdapterDescriptorFactory.js
displayName: Replace Debug Adapter Descriptor Factory

- script: 'node node_modules/vscode/bin/test'
displayName: 'Run debug integration tests'
workingDirectory: '$(Build.SourcesDirectory)/Extension'
continueOnError: true
env:
MOCK_DEBUG: 1
DISPLAY: :10
CODE_TESTS_PATH: '$(Build.SourcesDirectory)/Extension/out/test/integrationTests/debug'
CODE_EXTENSIONS_PATH: '$(Build.SourcesDirectory)/Extension'
CODE_TESTS_WORKSPACE: '$(Build.SourcesDirectory)/Extension/test/integrationTests/testAssets/SimpleCppProject'
CODE_DISABLE_EXTENSIONS: 1

- script: 'node node_modules/vscode/bin/test'
displayName: 'Run languageServer integration tests'
workingDirectory: '$(Build.SourcesDirectory)/Extension'
Expand All @@ -68,4 +52,4 @@ jobs:

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
continueOnError: true
continueOnError: true
Loading