Skip to content

Commit 2353dde

Browse files
joaomorenojoaomoreno
committed
Merge remote-tracking branch 'origin/master' into joao/compressed-trees
2 parents 6fbb757 + e4a837a commit 2353dde

194 files changed

Lines changed: 4521 additions & 2615 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.

‎build/gulpfile.hygiene.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const indentationFilter = [
5757
'!test/assert.js',
5858

5959
// except specific folders
60+
'!test/automation/out/**',
6061
'!test/smoke/out/**',
6162
'!extensions/vscode-api-tests/testWorkspace/**',
6263
'!extensions/vscode-api-tests/testWorkspace2/**',
@@ -152,6 +153,7 @@ const tslintCoreFilter = [
152153
'src/**/*.ts',
153154
'test/**/*.ts',
154155
'!extensions/**/*.ts',
156+
'!test/automation/**',
155157
'!test/smoke/**',
156158
...tslintBaseFilter
157159
];
@@ -160,6 +162,7 @@ const tslintExtensionsFilter = [
160162
'extensions/**/*.ts',
161163
'!src/**/*.ts',
162164
'!test/**/*.ts',
165+
'test/automation/**/*.ts',
163166
...tslintBaseFilter
164167
];
165168

‎build/gulpfile.vscode.linux.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ function prepareDebPackage(arch) {
4242
.pipe(replace('@@NAME_LONG@@', product.nameLong))
4343
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
4444
.pipe(replace('@@NAME@@', product.applicationName))
45+
.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
4546
.pipe(replace('@@ICON@@', product.linuxIconName))
4647
.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
4748

@@ -134,6 +135,7 @@ function prepareRpmPackage(arch) {
134135
.pipe(replace('@@NAME_LONG@@', product.nameLong))
135136
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
136137
.pipe(replace('@@NAME@@', product.applicationName))
138+
.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
137139
.pipe(replace('@@ICON@@', product.linuxIconName))
138140
.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
139141

@@ -203,21 +205,25 @@ function prepareSnapPackage(arch) {
203205
const destination = getSnapBuildPath(arch);
204206

205207
return function () {
208+
// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
206209
const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
207-
.pipe(rename(`usr/share/applications/${product.applicationName}.desktop`));
210+
.pipe(rename(`snap/gui/${product.applicationName}.desktop`));
208211

212+
// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
209213
const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
210-
.pipe(rename(`usr/share/applications/${product.applicationName}-url-handler.desktop`));
214+
.pipe(rename(`snap/gui/${product.applicationName}-url-handler.desktop`));
211215

212216
const desktops = es.merge(desktop, desktopUrlHandler)
213217
.pipe(replace('@@NAME_LONG@@', product.nameLong))
214218
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
215219
.pipe(replace('@@NAME@@', product.applicationName))
216-
.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.linuxIconName}.png`))
220+
.pipe(replace('@@EXEC@@', product.applicationName))
221+
.pipe(replace('@@ICON@@', `\${SNAP}/meta/gui/${product.linuxIconName}.png`))
217222
.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
218223

224+
// An icon that is placed in snap/gui will be placed into meta/gui verbatim.
219225
const icon = gulp.src('resources/linux/code.png', { base: '.' })
220-
.pipe(rename(`usr/share/pixmaps/${product.linuxIconName}.png`));
226+
.pipe(rename(`snap/gui/${product.linuxIconName}.png`));
221227

222228
const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
223229
.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));

‎build/gulpfile.vscode.web.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const vscodeWebResources = [
3535

3636
// Workbench
3737
'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png}',
38-
'out-build/vs/code/browser/workbench/workbench.html',
38+
'out-build/vs/code/browser/workbench/*.html',
3939
'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
4040
'out-build/vs/**/markdown.css',
4141

‎build/lib/i18n.resources.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@
170170
"name": "vs/workbench/contrib/webview",
171171
"project": "vscode-workbench"
172172
},
173+
{
174+
"name": "vs/workbench/contrib/customEditor",
175+
"project": "vscode-workbench"
176+
},
173177
{
174178
"name": "vs/workbench/contrib/welcome",
175179
"project": "vscode-workbench"

‎build/npm/postinstall.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ runtime "${runtime}"`;
7070
}
7171

7272
yarnInstall(`build`); // node modules required for build
73+
yarnInstall('test/automation'); // node modules required for smoketest
7374
yarnInstall('test/smoke'); // node modules required for smoketest
7475
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
7576

‎build/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,9 +2433,9 @@ vsce@1.48.0:
24332433
yazl "^2.2.2"
24342434

24352435
vscode-ripgrep@^1.5.6:
2436-
version "1.5.6"
2437-
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.6.tgz#93bf5c99ca5f8248950a305e224f6ca153c30af4"
2438-
integrity sha512-WRIM9XpUj6dsfdAmuI3ANbmT1ysPUVsYy/2uCLDHJa9kbiB4T7uGvFnnc0Rgx2qQnyRAwL7PeWaFgUljPPxf2g==
2436+
version "1.5.7"
2437+
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.7.tgz#acb6b548af488a4bca5d0f1bb5faf761343289ce"
2438+
integrity sha512-/Vsz/+k8kTvui0q3O74pif9FK0nKopgFTiGNVvxicZANxtSA8J8gUE9GQ/4dpi7D/2yI/YVORszwVskFbz46hQ==
24392439

24402440
vscode-telemetry-extractor@^1.5.4:
24412441
version "1.5.4"

‎extensions/html-language-features/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"main": "./out/htmlServerMain",
1111
"dependencies": {
1212
"vscode-css-languageservice": "^4.0.3-next.6",
13-
"vscode-html-languageservice": "^3.0.4-next.2",
13+
"vscode-html-languageservice": "^3.0.4-next.3",
1414
"vscode-languageserver": "^5.3.0-next.8",
1515
"vscode-languageserver-types": "3.15.0-next.2",
1616
"vscode-nls": "^4.1.1",

‎extensions/html-language-features/server/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ vscode-css-languageservice@^4.0.3-next.6:
238238
vscode-nls "^4.1.1"
239239
vscode-uri "^2.0.3"
240240

241-
vscode-html-languageservice@^3.0.4-next.2:
242-
version "3.0.4-next.2"
243-
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.0.4-next.2.tgz#afdbe2781daa0a72613afac77068593925bd2e07"
244-
integrity sha512-tlyiflBm/k/PoTwGzg4LL0cwq6wS7mnKxDVYSlY2Iw21dONWINaS0MynYCn6Zs4PzIpgueCSMuTBQTey4d+BBQ==
241+
vscode-html-languageservice@^3.0.4-next.3:
242+
version "3.0.4-next.3"
243+
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.0.4-next.3.tgz#7a0fc33aae846165b157acbb8b133cc3fcf2ca0d"
244+
integrity sha512-PGIcKFxqsvVMv51QWreuQx9LhN43Vzhgl8RYI8CcWThjl+J8uUKImjwAWq9zndOiiRUPF2Zk7zME/dMIis1hOw==
245245
dependencies:
246246
vscode-languageserver-types "^3.15.0-next.2"
247247
vscode-nls "^4.1.1"

‎extensions/image-preview/.vscodeignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
test/**
2+
src/**
3+
tsconfig.json
4+
out/test/**
5+
out/**
6+
extension.webpack.config.js
7+
cgmanifest.json
8+
yarn.lock
9+
preview-src/**
10+
webpack.config.js

‎extensions/image-preview/README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Image Preview
2+
3+
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

0 commit comments

Comments
 (0)