Skip to content

Commit 3a02877

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into tyriar/44435
2 parents fede343 + e15a83a commit 3a02877

216 files changed

Lines changed: 1946 additions & 1669 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.

‎.github/classifier.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
color-picker: [],
1111
css-less-sass: [ aeschli ],
1212
debug: {
13-
assignees: [ weinand ],
13+
assignees: [ isidorn ],
1414
assignLabel: false
1515
},
1616
diff-editor: [],

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@
3838
}
3939
}
4040
],
41-
"typescript.tsdk": "node_modules/typescript/lib"
41+
"typescript.tsdk": "node_modules/typescript/lib",
42+
"npm.exclude": "**/extensions/**"
4243
}

‎build/builtInExtensions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.21.6",
4+
"version": "1.21.8",
55
"repo": "https://github.com/Microsoft/vscode-node-debug"
66
},
77
{
88
"name": "ms-vscode.node-debug2",
9-
"version": "1.21.1",
9+
"version": "1.21.2",
1010
"repo": "https://github.com/Microsoft/vscode-node-debug2"
1111
}
1212
]

‎build/gulpfile.vscode.linux.js‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,6 @@ const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
2121

2222
const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
2323

24-
const flatpakManifest = {
25-
appId: product.darwinBundleIdentifier, // We need a reverse-url style identifier.
26-
sdk: 'org.freedesktop.Sdk',
27-
runtime: 'org.freedesktop.Sdk',
28-
runtimeVersion: '1.4',
29-
base: 'io.atom.electron.BaseApp',
30-
baseFlatpakref: 'https://s3-us-west-2.amazonaws.com/electron-flatpak.endlessm.com/electron-base-app-master.flatpakref',
31-
command: product.applicationName,
32-
symlinks: [
33-
['/share/' + product.applicationName + '/bin/' + product.applicationName, '/bin/' + product.applicationName],
34-
],
35-
finishArgs: [
36-
'--share=ipc', '--socket=x11', // Allow showing X11 windows.
37-
'--share=network', // Network access (e.g. for installing extension).
38-
'--filesystem=host', // Allow access to the whole file system.
39-
'--device=dri', // Allow OpenGL rendering.
40-
'--filesystem=/tmp', // Needed for Chromium's single instance check.
41-
'--socket=pulseaudio', // Some extensions may want to play sounds...
42-
'--talk-name=org.freedesktop.Notifications', // ...or pop up notifications.
43-
],
44-
};
45-
46-
4724
function getDebPackageArch(arch) {
4825
return { x64: 'amd64', ia32: 'i386', arm: 'armhf' }[arch];
4926
}
@@ -227,79 +204,6 @@ function buildSnapPackage(arch) {
227204
]);
228205
}
229206

230-
function getFlatpakArch(arch) {
231-
return { x64: 'x86_64', ia32: 'i386', arm: 'arm' }[arch];
232-
}
233-
234-
function prepareFlatpak(arch) {
235-
const binaryDir = '../VSCode-linux-' + arch;
236-
const flatpakArch = getFlatpakArch(arch);
237-
const destination = '.build/linux/flatpak/' + flatpakArch;
238-
239-
return function () {
240-
// This is not imported in the global scope to avoid requiring ImageMagick
241-
// (or GraphicsMagick) when not building building Flatpak bundles.
242-
const imgResize = require('gulp-image-resize');
243-
244-
const all = [16, 24, 32, 48, 64, 128, 192, 256, 512].map(function (size) {
245-
return gulp.src('resources/linux/code.png', { base: '.' })
246-
.pipe(imgResize({ width: size, height: size, format: "png", noProfile: true }))
247-
.pipe(rename('share/icons/hicolor/' + size + 'x' + size + '/apps/' + flatpakManifest.appId + '.png'));
248-
});
249-
250-
all.push(gulp.src('resources/linux/code.desktop', { base: '.' })
251-
.pipe(replace('Exec=/usr/share/@@NAME@@/@@NAME@@', 'Exec=' + product.applicationName))
252-
.pipe(replace('@@NAME_LONG@@', product.nameLong))
253-
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
254-
.pipe(replace('@@NAME@@', product.applicationName))
255-
.pipe(rename('share/applications/' + flatpakManifest.appId + '.desktop')));
256-
257-
all.push(gulp.src('resources/linux/code.appdata.xml', { base: '.' })
258-
.pipe(replace('@@NAME_LONG@@', product.nameLong))
259-
.pipe(replace('@@NAME@@', flatpakManifest.appId))
260-
.pipe(replace('@@LICENSE@@', product.licenseName))
261-
.pipe(rename('share/appdata/' + flatpakManifest.appId + '.appdata.xml')));
262-
263-
all.push(gulp.src(binaryDir + '/**/*', { base: binaryDir })
264-
.pipe(rename(function (p) {
265-
p.dirname = 'share/' + product.applicationName + '/' + p.dirname;
266-
})));
267-
268-
return es.merge(all).pipe(vfs.dest(destination));
269-
};
270-
}
271-
272-
function buildFlatpak(arch) {
273-
const flatpakArch = getFlatpakArch(arch);
274-
const manifest = {};
275-
for (var k in flatpakManifest) {
276-
manifest[k] = flatpakManifest[k];
277-
}
278-
manifest.files = [
279-
['.build/linux/flatpak/' + flatpakArch, '/'],
280-
];
281-
const buildOptions = {
282-
arch: flatpakArch,
283-
subject: product.nameLong + ' ' + packageJson.version + '.' + linuxPackageRevision,
284-
};
285-
// If requested, use the configured path for the OSTree repository.
286-
if (process.env.FLATPAK_REPO) {
287-
buildOptions.repoDir = process.env.FLATPAK_REPO;
288-
} else {
289-
buildOptions.bundlePath = manifest.appId + '-' + flatpakArch + '.flatpak';
290-
}
291-
// Setup PGP signing if requested.
292-
if (process.env.GPG_KEY_ID !== undefined) {
293-
buildOptions.gpgSign = process.env.GPG_KEY_ID;
294-
if (process.env.GPG_HOMEDIR) {
295-
buildOptions.gpgHomedir = process.env.GPG_HOME_DIR;
296-
}
297-
}
298-
return function (cb) {
299-
require('flatpak-bundler').bundle(manifest, buildOptions, cb);
300-
};
301-
}
302-
303207
gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
304208
gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/deb/amd64'));
305209
gulp.task('clean-vscode-linux-arm-deb', util.rimraf('.build/linux/deb/armhf'));
@@ -333,10 +237,3 @@ gulp.task('vscode-linux-arm-prepare-snap', ['clean-vscode-linux-arm-snap'], prep
333237
gulp.task('vscode-linux-ia32-build-snap', ['vscode-linux-ia32-prepare-snap'], buildSnapPackage('ia32'));
334238
gulp.task('vscode-linux-x64-build-snap', ['vscode-linux-x64-prepare-snap'], buildSnapPackage('x64'));
335239
gulp.task('vscode-linux-arm-build-snap', ['vscode-linux-arm-prepare-snap'], buildSnapPackage('arm'));
336-
337-
gulp.task('vscode-linux-ia32-prepare-flatpak', ['clean-vscode-linux-ia32-flatpak'], prepareFlatpak('ia32'));
338-
gulp.task('vscode-linux-x64-prepare-flatpak', ['clean-vscode-linux-x64-flatpak'], prepareFlatpak('x64'));
339-
gulp.task('vscode-linux-arm-prepare-flatpak', ['clean-vscode-linux-arm-flatpak'], prepareFlatpak('arm'));
340-
gulp.task('vscode-linux-ia32-flatpak', ['vscode-linux-ia32-prepare-flatpak'], buildFlatpak('ia32'));
341-
gulp.task('vscode-linux-x64-flatpak', ['vscode-linux-x64-prepare-flatpak'], buildFlatpak('x64'));
342-
gulp.task('vscode-linux-arm-flatpak', ['vscode-linux-arm-prepare-flatpak'], buildFlatpak('arm'));

‎extensions/bat/language-configuration.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
["{", "}"],
1212
["[", "]"],
1313
["(", ")"],
14-
["\"", "\""],
15-
["`", "`"]
14+
["\"", "\""]
1615
],
1716
"surroundingPairs": [
1817
["{", "}"],

‎extensions/bat/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "Windows Bat Language Basics",
3-
"description": "Provides Syntax highlighting, Folding, Bracket matching and Snippets in Windows batch files"
3+
"description": "Provides snippets, syntax highlighting, bracket matching and folding in Windows batch files."
44
}

‎extensions/clojure/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "Clojure Language Basics",
3-
"description": "Provides Syntax highlighting and Bracket matching in Clojure files"
3+
"description": "Provides syntax highlighting and bracket matching in Clojure files."
44
}

‎extensions/coffeescript/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "CoffeeScript Language Basics",
3-
"description": "Provides Syntax highlighting, Folding, Bracket matching and Snippets in CoffeeScript files"
3+
"description": "Provides snippets, syntax highlighting, bracket matching and folding in CoffeeScript files."
44
}

‎extensions/configuration-editing/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "Configuration Editing",
3-
"description": "Provides capabilities (advanced intelli-sense, auto-fixing) in configuration files like settings, launch and extension recommendation files"
3+
"description": "Provides capabilities (advanced IntelliSense, auto-fixing) in configuration files like settings, launch and extension recommendation files."
44
}

‎extensions/cpp/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"displayName": "C/C++ Language Basics",
3-
"description": "Provides Syntax highlighting, Folding, Bracket matching and Snippets in C/C++ files"
3+
"description": "Provides snippets, syntax highlighting, bracket matching and folding in C/C++ files."
44
}

0 commit comments

Comments
 (0)