Skip to content

Commit 9aa9ea7

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/empty-views
2 parents 1ceefd1 + 15d9336 commit 9aa9ea7

189 files changed

Lines changed: 1894 additions & 1322 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@
627627
},
628628
{
629629
"target": "{**/**.test.ts,**/test/**}",
630-
"restrictions": "{**/vs/**,assert,sinon,crypto}"
630+
"restrictions": "{**/vs/**,assert,sinon,crypto,xterm*}"
631631
},
632632
{
633633
"target": "**/{common,browser,workbench}/**",

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# TODO: rename azure-pipelines/linux/xvfb.init to github-actions
2222
- run: |
2323
sudo apt-get update
24-
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
24+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
2525
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
2626
sudo chmod +x /etc/init.d/xvfb
2727
sudo update-rc.d xvfb defaults
@@ -47,9 +47,8 @@ jobs:
4747
name: Download Built-in Extensions
4848
- run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
4949
name: Run Unit Tests (Electron)
50-
# Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
51-
# - run: DISPLAY=:10 yarn test-browser --browser chromium
52-
# name: Run Unit Tests (Browser)
50+
- run: DISPLAY=:10 yarn test-browser --browser chromium
51+
name: Run Unit Tests (Browser)
5352
- run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
5453
name: Run Integration Tests (Electron)
5554

‎build/azure-pipelines/darwin/product-build-darwin.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ steps:
9999
displayName: Run unit tests (Electron)
100100
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
101101

102+
- script: |
103+
set -e
104+
yarn test-browser --build --browser chromium --browser webkit
105+
displayName: Run unit tests (Browser)
106+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
107+
102108
- script: |
103109
# Figure out the full absolute path of the product we just built
104110
# including the remote server and configure the integration tests

‎build/azure-pipelines/linux/product-build-linux.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ steps:
104104
displayName: Run unit tests (Electron)
105105
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
106106

107+
- script: |
108+
set -e
109+
DISPLAY=:10 yarn test-browser --build --browser chromium
110+
continueOnError: true
111+
displayName: Run unit tests (Browser)
112+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
113+
107114
- script: |
108115
# Figure out the full absolute path of the product we just built
109116
# including the remote server and configure the integration tests
@@ -117,13 +124,13 @@ steps:
117124
displayName: Run integration tests (Electron)
118125
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
119126

120-
# Fails due to weird error: Protocol error (Target.getBrowserContexts): Target closed.
121-
# - script: |
122-
# set -e
123-
# VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
124-
# DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
125-
# displayName: Run integration tests (Browser)
126-
# condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
127+
- script: |
128+
set -e
129+
VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
130+
DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
131+
continueOnError: true
132+
displayName: Run integration tests (Browser)
133+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
127134

128135
- script: |
129136
set -e

‎build/azure-pipelines/win32/product-build-win32.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ steps:
112112
displayName: Run unit tests (Electron)
113113
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
114114

115+
- powershell: |
116+
. build/azure-pipelines/win32/exec.ps1
117+
$ErrorActionPreference = "Stop"
118+
exec { yarn test-browser --build --browser chromium }
119+
displayName: Run unit tests (Browser)
120+
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
121+
115122
- powershell: |
116123
# Figure out the full absolute path of the product we just built
117124
# including the remote server and configure the integration tests
@@ -132,14 +139,6 @@ steps:
132139
displayName: Run integration tests (Browser)
133140
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
134141

135-
- powershell: |
136-
. build/azure-pipelines/win32/exec.ps1
137-
$ErrorActionPreference = "Stop"
138-
exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; yarn smoketest --web --headless --browser chromium }
139-
continueOnError: true
140-
displayName: Run smoke tests (Browser)
141-
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
142-
143142
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
144143
inputs:
145144
ConnectedServiceName: 'ESRP CodeSign'

‎build/azure-pipelines/win32/publish.ps1‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ $SystemExe = "$Repo\.build\win32-$Arch\system-setup\VSCodeSetup.exe"
1111
$UserExe = "$Repo\.build\win32-$Arch\user-setup\VSCodeSetup.exe"
1212
$Zip = "$Repo\.build\win32-$Arch\archive\VSCode-win32-$Arch.zip"
1313
$LegacyServer = "$Root\vscode-reh-win32-$Arch"
14-
$ServerName = "vscode-server-win32-$Arch"
15-
$Server = "$Root\$ServerName"
14+
$Server = "$Root\vscode-server-win32-$Arch"
1615
$ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
1716
$Build = "$Root\VSCode-win32-$Arch"
1817

1918
# Create server archive
20-
exec { Rename-Item -Path $LegacyServer -NewName $ServerName }
19+
exec { xcopy $LegacyServer $Server /H /E /I }
2120
exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
2221

2322
# get version

‎extensions/configuration-editing/src/settingsDocumentHelper.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class SettingsDocument {
8686
}));
8787
} else {
8888
// Value
89-
return this.provideLanguageCompletionItems(location, range);
89+
return this.provideLanguageCompletionItemsForLanguageOverrides(location, range);
9090
}
9191
}
9292

@@ -158,6 +158,11 @@ export class SettingsDocument {
158158
}
159159

160160
private provideLanguageCompletionItems(_location: Location, range: vscode.Range, formatFunc: (string: string) => string = (l) => JSON.stringify(l)): Thenable<vscode.CompletionItem[]> {
161+
return vscode.languages.getLanguages()
162+
.then(languages => languages.map(l => this.newSimpleCompletionItem(formatFunc(l), range)));
163+
}
164+
165+
private provideLanguageCompletionItemsForLanguageOverrides(_location: Location, range: vscode.Range, formatFunc: (string: string) => string = (l) => JSON.stringify(l)): Thenable<vscode.CompletionItem[]> {
161166
return vscode.languages.getLanguages().then(languages => {
162167
const completionItems = [];
163168
const configuration = vscode.workspace.getConfiguration();
@@ -182,7 +187,7 @@ export class SettingsDocument {
182187
let text = this.document.getText(range);
183188
if (text && text.trim().startsWith('[')) {
184189
range = new vscode.Range(new vscode.Position(range.start.line, range.start.character + text.indexOf('[')), range.end);
185-
return this.provideLanguageCompletionItems(location, range, language => `"[${language}]"`);
190+
return this.provideLanguageCompletionItemsForLanguageOverrides(location, range, language => `"[${language}]"`);
186191
}
187192

188193
range = this.document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
@@ -209,7 +214,7 @@ export class SettingsDocument {
209214
// Suggestion model word matching includes closed sqaure bracket and ending quote
210215
// Hence include them in the proposal to replace
211216
let range = this.document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
212-
return this.provideLanguageCompletionItems(location, range, language => `"[${language}]"`);
217+
return this.provideLanguageCompletionItemsForLanguageOverrides(location, range, language => `"[${language}]"`);
213218
}
214219
return Promise.resolve([]);
215220
}

‎extensions/emmet/src/test/test-fixtures/marker.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DO NOT DELETE, USED BY INTEGRATION TESTS

‎extensions/git/src/git.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ function sanitizePath(path: string): string {
333333
return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
334334
}
335335

336-
const COMMIT_FORMAT = '%H\n%aN\n%aE\n%at\n%P\n%B';
336+
const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%P%n%B';
337337

338338
export class Git {
339339

@@ -801,8 +801,8 @@ export class Repository {
801801
}
802802

803803
async log(options?: LogOptions): Promise<Commit[]> {
804-
const maxEntries = options && typeof options.maxEntries === 'number' && options.maxEntries > 0 ? options.maxEntries : 32;
805-
const args = ['log', '-' + maxEntries, `--format:${COMMIT_FORMAT}`, '-z'];
804+
const maxEntries = options?.maxEntries ?? 32;
805+
const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--'];
806806

807807
const result = await this.run(args);
808808
if (result.exitCode) {
@@ -815,7 +815,7 @@ export class Repository {
815815

816816
async logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
817817
const maxEntries = options?.maxEntries ?? 32;
818-
const args = ['log', `-${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--', uri.fsPath];
818+
const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--', uri.fsPath];
819819

820820
const result = await this.run(args);
821821
if (result.exitCode) {

‎extensions/markdown-language-features/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"dependencies": {
333333
"highlight.js": "9.15.10",
334334
"markdown-it": "^10.0.0",
335-
"markdown-it-front-matter": "^0.1.2",
335+
"markdown-it-front-matter": "^0.2.1",
336336
"vscode-extension-telemetry": "0.1.1",
337337
"vscode-nls": "^4.0.0"
338338
},

0 commit comments

Comments
 (0)