Skip to content

Commit 54d3742

Browse files
iansan5653iansan5653
committed
Merge remote-tracking branch 'upstream/master'
2 parents d70ae4a + 199461e commit 54d3742

74 files changed

Lines changed: 842 additions & 476 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/azure-pipelines/linux/snap-build-linux.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ steps:
1616
- script: |
1717
set -e
1818
19+
# Get snapcraft version
20+
snapcraft --version
21+
1922
# Make sure we get latest packages
2023
sudo apt-get update
2124
sudo apt-get upgrade -y
@@ -38,7 +41,7 @@ steps:
3841
PACKAGEJSON="$(ls $SNAP_ROOT/code*/usr/share/code*/resources/app/package.json)"
3942
VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
4043
SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
41-
(cd $SNAP_ROOT/code-* && snapcraft snap --output "$SNAP_PATH")
44+
(cd $SNAP_ROOT/code-* && sudo snapcraft snap --output "$SNAP_PATH")
4245
4346
# Publish snap package
4447
AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.33.1",
4+
"version": "1.33.2",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",

‎build/gulpfile.vscode.linux.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,17 @@ function prepareSnapPackage(arch) {
200200

201201
return function () {
202202
const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
203+
.pipe(rename(`usr/share/applications/${product.applicationName}.desktop`));
204+
205+
const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
206+
.pipe(rename(`usr/share/applications/${product.applicationName}-url-handler.desktop`));
207+
208+
const desktops = es.merge(desktop, desktopUrlHandler)
203209
.pipe(replace('@@NAME_LONG@@', product.nameLong))
204210
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
205211
.pipe(replace('@@NAME@@', product.applicationName))
206212
.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.linuxIconName}.png`))
207-
.pipe(rename(`usr/share/applications/${product.applicationName}.desktop`));
213+
.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
208214

209215
const icon = gulp.src('resources/linux/code.png', { base: '.' })
210216
.pipe(rename(`usr/share/pixmaps/${product.linuxIconName}.png`));
@@ -220,7 +226,7 @@ function prepareSnapPackage(arch) {
220226
const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
221227
.pipe(rename('electron-launch'));
222228

223-
const all = es.merge(desktop, icon, code, snapcraft, electronLaunch);
229+
const all = es.merge(desktops, icon, code, snapcraft, electronLaunch);
224230

225231
return all.pipe(vfs.dest(destination));
226232
};

‎build/lib/tslint/noNlsInStandaloneEditorRule.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const Lint = require("tslint");
99
const path_1 = require("path");
1010
class Rule extends Lint.Rules.AbstractRule {
1111
apply(sourceFile) {
12-
console.log(sourceFile.fileName);
1312
if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
1413
|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
1514
|| /vs(\/|\\)editor(\/|\\)editor.api/.test(sourceFile.fileName)

‎build/lib/tslint/noNlsInStandaloneEditorRule.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { join } from 'path';
99

1010
export class Rule extends Lint.Rules.AbstractRule {
1111
public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
12-
console.log(sourceFile.fileName);
1312
if (
1413
/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
1514
|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"main": "./out/cssServerMain",
1111
"dependencies": {
12-
"vscode-css-languageservice": "^4.0.0-next.5",
12+
"vscode-css-languageservice": "^4.0.2-next.1",
1313
"vscode-languageserver": "^5.3.0-next.2"
1414
},
1515
"devDependencies": {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ supports-color@5.4.0:
229229
dependencies:
230230
has-flag "^3.0.0"
231231

232-
vscode-css-languageservice@^4.0.0-next.5:
233-
version "4.0.0-next.5"
234-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.0-next.5.tgz#a9246d3c85c33e2878b305a93de6a2c7fef53d3b"
235-
integrity sha512-ZO8mfoZjPgY+T77+frQHtlXPxt00ogPJfdOY2T8I3vT+1m32GIUKjcmgwg4sMtx3/+PYwu2SowgygrStny9JvQ==
232+
vscode-css-languageservice@^4.0.2-next.1:
233+
version "4.0.2-next.1"
234+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2-next.1.tgz#452455edd8bc70cf16d584081958ff138b08396a"
235+
integrity sha512-45Rk8IBgvOfesTRLlIQs0g8OMuiubRazqa09cyAZO4aObAYUTMFQr/JDPz3jB+mB7qWpAip90x80gJ8MVw22vA==
236236
dependencies:
237237
vscode-languageserver-types "^3.14.0"
238238
vscode-nls "^4.0.0"

‎extensions/css/cgmanifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"component": {
55
"type": "git",
66
"git": {
7-
"name": "atom/language-css",
8-
"repositoryUrl": "https://github.com/atom/language-css",
9-
"commitHash": "7e06c88b89218fe6e8eba77fb674152f1cea0b10"
7+
"name": "octref/language-css",
8+
"repositoryUrl": "https://github.com/octref/language-css",
9+
"commitHash": "6d3a2d01dd67ef062030f4520dd42a5424330a3b"
1010
}
1111
},
1212
"license": "MIT",
13-
"description": "The file syntaxes/css.tmLanguage.json was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
13+
"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/octref/language-css which was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
1414
"version": "0.0.0"
1515
}
1616
],

‎extensions/html-language-features/client/src/htmlMain.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,10 @@ export function activate(context: ExtensionContext) {
144144
});
145145

146146
const regionCompletionRegExpr = /^(\s*)(<(!(-(-\s*(#\w*)?)?)?)?)?$/;
147+
const htmlSnippetCompletionRegExpr = /^(\s*)(<(h(t(m(l)?)?)?)?)?$/;
147148
languages.registerCompletionItemProvider(documentSelector, {
148149
provideCompletionItems(doc, pos) {
150+
const results: CompletionItem[] = [];
149151
let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos));
150152
let match = lineUntilPos.match(regionCompletionRegExpr);
151153
if (match) {
@@ -156,15 +158,41 @@ export function activate(context: ExtensionContext) {
156158
beginProposal.documentation = localize('folding.start', 'Folding Region Start');
157159
beginProposal.filterText = match[2];
158160
beginProposal.sortText = 'za';
161+
results.push(beginProposal);
159162
let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet);
160163
endProposal.range = range;
161164
endProposal.insertText = new SnippetString('<!-- #endregion -->');
162165
endProposal.documentation = localize('folding.end', 'Folding Region End');
163166
endProposal.filterText = match[2];
164167
endProposal.sortText = 'zb';
165-
return [beginProposal, endProposal];
168+
results.push(endProposal);
166169
}
167-
return null;
170+
let match2 = lineUntilPos.match(htmlSnippetCompletionRegExpr);
171+
if (match2 && doc.getText(new Range(new Position(0, 0), pos)).match(htmlSnippetCompletionRegExpr)) {
172+
let range = new Range(new Position(pos.line, match2[1].length), pos);
173+
let snippetProposal = new CompletionItem('HTML sample', CompletionItemKind.Snippet);
174+
snippetProposal.range = range;
175+
const content = ['<!DOCTYPE html>',
176+
'<html>',
177+
'<head>',
178+
'\t<meta charset=\'utf-8\'>',
179+
'\t<meta http-equiv=\'X-UA-Compatible\' content=\'IE=edge\'>',
180+
'\t<title>${1:Page Title}</title>',
181+
'\t<meta name=\'viewport\' content=\'width=device-width, initial-scale=1\'>',
182+
'\t<link rel=\'stylesheet\' type=\'text/css\' media=\'screen\' href=\'${2:main.css}\'>',
183+
'\t<script src=\'${3:main.js}\'></script>',
184+
'</head>',
185+
'<body>',
186+
'\t$0',
187+
'</body>',
188+
'</html>'].join('\n');
189+
snippetProposal.insertText = new SnippetString(content);
190+
snippetProposal.documentation = localize('folding.html', 'Simple HTML5 starting point');
191+
snippetProposal.filterText = match2[2];
192+
snippetProposal.sortText = 'za';
193+
results.push(snippetProposal);
194+
}
195+
return results;
168196
}
169197
});
170198
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"main": "./out/htmlServerMain",
1111
"dependencies": {
12-
"vscode-css-languageservice": "^4.0.0-next.3",
13-
"vscode-html-languageservice": "^3.0.0-next.3",
12+
"vscode-css-languageservice": "^4.0.2-next.1",
13+
"vscode-html-languageservice": "^3.0.0-next.5",
1414
"vscode-languageserver": "^5.3.0-next.2",
1515
"vscode-languageserver-types": "^3.14.0",
1616
"vscode-nls": "^4.0.0",

0 commit comments

Comments
 (0)