Skip to content

Commit 4178699

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/master' into runtime-extensions
2 parents 5258ffe + c38d257 commit 4178699

86 files changed

Lines changed: 1883 additions & 885 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.

‎extensions/bat/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"language": "bat",
1818
"scopeName": "source.batchfile",
1919
"path": "./syntaxes/batchfile.tmLanguage.json"
20+
}],
21+
"snippets": [{
22+
"language": "bat",
23+
"path": "./snippets/batchfile.snippets.json"
2024
}]
2125
}
2226
}

‎extensions/bat/snippets/batchfile.snippets.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"Region Start": {
3+
"prefix": "#region",
4+
"body": [
5+
"::#region"
6+
],
7+
"description": "Folding Region Start"
8+
},
9+
"Region End": {
10+
"prefix": "#endregion",
11+
"body": [
12+
"::#endregion"
13+
],
14+
"description": "Folding Region End"
15+
}
16+
}

‎extensions/coffeescript/language-configuration.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
["'", "'"]
2424
],
2525
"folding": {
26-
"offSide": true
26+
"offSide": true,
27+
"markers": {
28+
"start": "^\\s*#region\\b",
29+
"end": "^\\s*#endregion\\b"
30+
}
2731
}
28-
}
32+
}

‎extensions/coffeescript/package.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
{
2323
"language": "coffeescript"
2424
}
25-
]
25+
],
26+
"snippets": [{
27+
"language": "coffeescript",
28+
"path": "./snippets/coffeescript.snippets.json"
29+
}]
2630
}
2731
}

‎extensions/coffeescript/snippets/coffeescript.snippets.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"Region Start": {
3+
"prefix": "#region",
4+
"body": [
5+
"#region"
6+
],
7+
"description": "Folding Region Start"
8+
},
9+
"Region End": {
10+
"prefix": "#endregion",
11+
"body": [
12+
"#endregion"
13+
],
14+
"description": "Folding Region End"
15+
}
16+
}

‎extensions/css/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
"path": "./syntaxes/css.tmLanguage.json"
4444
}
4545
],
46+
"snippets": [{
47+
"language": "css",
48+
"path": "./snippets/css.snippets.json"
49+
}],
4650
"configuration": [
4751
{
4852
"order": 22,

‎extensions/css/snippets/css.snippets.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"Region Start": {
3+
"prefix": "#region",
4+
"body": [
5+
"/*#region $0*/"
6+
],
7+
"description": "Folding Region Start"
8+
},
9+
"Region End": {
10+
"prefix": "#endregion",
11+
"body": [
12+
"/*#endregion $0*/"
13+
],
14+
"description": "Folding Region End"
15+
}
16+
}

‎extensions/git/src/repository.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,8 @@ export class Resource implements SourceControlResourceState {
171171
}
172172

173173
get decorations(): SourceControlResourceDecorations {
174-
// TODO@joh, still requires restart/redraw in the SCM viewlet
175-
const decorations = workspace.getConfiguration().get<boolean>('git.decorations.enabled');
176-
const light = !decorations ? { iconPath: this.getIconPath('light') } : undefined;
177-
const dark = !decorations ? { iconPath: this.getIconPath('dark') } : undefined;
174+
const light = this._useIcons ? { iconPath: this.getIconPath('light') } : undefined;
175+
const dark = this._useIcons ? { iconPath: this.getIconPath('dark') } : undefined;
178176
const tooltip = this.tooltip;
179177
const strikeThrough = this.strikeThrough;
180178
const faded = this.faded;
@@ -275,6 +273,7 @@ export class Resource implements SourceControlResourceState {
275273
private _resourceGroupType: ResourceGroupType,
276274
private _resourceUri: Uri,
277275
private _type: Status,
276+
private _useIcons: boolean,
278277
private _renameResourceUri?: Uri
279278
) { }
280279
}
@@ -863,6 +862,7 @@ export class Repository implements Disposable {
863862
const { status, didHitLimit } = await this.repository.getStatus();
864863
const config = workspace.getConfiguration('git');
865864
const shouldIgnore = config.get<boolean>('ignoreLimitWarning') === true;
865+
const useIcons = config.get<boolean>('decorations.enabled', true);
866866

867867
this.isRepositoryHuge = didHitLimit;
868868

@@ -910,30 +910,30 @@ export class Repository implements Disposable {
910910
const renameUri = raw.rename ? Uri.file(path.join(this.repository.root, raw.rename)) : undefined;
911911

912912
switch (raw.x + raw.y) {
913-
case '??': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.UNTRACKED));
914-
case '!!': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.IGNORED));
915-
case 'DD': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_DELETED));
916-
case 'AU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.ADDED_BY_US));
917-
case 'UD': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.DELETED_BY_THEM));
918-
case 'UA': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.ADDED_BY_THEM));
919-
case 'DU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.DELETED_BY_US));
920-
case 'AA': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_ADDED));
921-
case 'UU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_MODIFIED));
913+
case '??': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.UNTRACKED, useIcons));
914+
case '!!': return workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.IGNORED, useIcons));
915+
case 'DD': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_DELETED, useIcons));
916+
case 'AU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.ADDED_BY_US, useIcons));
917+
case 'UD': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.DELETED_BY_THEM, useIcons));
918+
case 'UA': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.ADDED_BY_THEM, useIcons));
919+
case 'DU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.DELETED_BY_US, useIcons));
920+
case 'AA': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_ADDED, useIcons));
921+
case 'UU': return merge.push(new Resource(ResourceGroupType.Merge, uri, Status.BOTH_MODIFIED, useIcons));
922922
}
923923

924924
let isModifiedInIndex = false;
925925

926926
switch (raw.x) {
927-
case 'M': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_MODIFIED)); isModifiedInIndex = true; break;
928-
case 'A': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_ADDED)); break;
929-
case 'D': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_DELETED)); break;
930-
case 'R': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_RENAMED, renameUri)); break;
931-
case 'C': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_COPIED, renameUri)); break;
927+
case 'M': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_MODIFIED, useIcons)); isModifiedInIndex = true; break;
928+
case 'A': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_ADDED, useIcons)); break;
929+
case 'D': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_DELETED, useIcons)); break;
930+
case 'R': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_RENAMED, useIcons, renameUri)); break;
931+
case 'C': index.push(new Resource(ResourceGroupType.Index, uri, Status.INDEX_COPIED, useIcons, renameUri)); break;
932932
}
933933

934934
switch (raw.y) {
935-
case 'M': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.MODIFIED, renameUri)); break;
936-
case 'D': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.DELETED, renameUri)); break;
935+
case 'M': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri)); break;
936+
case 'D': workingTree.push(new Resource(ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break;
937937
}
938938
});
939939

‎extensions/html/server/src/htmlServerMain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
103103
let capabilities: ServerCapabilities & CPServerCapabilities = {
104104
// Tell the client that the server works in FULL text document sync mode
105105
textDocumentSync: documents.syncKind,
106-
completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '=', '/', '>'] } : undefined,
106+
completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '=', '/'] } : undefined,
107107
hoverProvider: true,
108108
documentHighlightProvider: true,
109109
documentRangeFormattingProvider: false,

‎extensions/java/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"language": "java",
1818
"scopeName": "source.java",
1919
"path": "./syntaxes/java.tmLanguage.json"
20+
}],
21+
"snippets": [{
22+
"language": "java",
23+
"path": "./snippets/java.snippets.json"
2024
}]
2125
}
2226
}

0 commit comments

Comments
 (0)