Skip to content

Commit a5b9969

Browse files
jriekenjrieken
authored
Merge branch 'master' into joh/sigusr1
2 parents ad597a4 + eaedd52 commit a5b9969

267 files changed

Lines changed: 1875 additions & 2248 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/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"mime": "^1.3.4",
4141
"minimist": "^1.2.0",
4242
"request": "^2.85.0",
43-
"terser": "4.3.1",
43+
"terser": "4.3.8",
4444
"tslint": "^5.9.1",
4545
"typescript": "3.6.2",
4646
"vsce": "1.48.0",

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,10 +2178,10 @@ terser@*:
21782178
source-map "~0.6.1"
21792179
source-map-support "~0.5.12"
21802180

2181-
terser@4.3.1:
2182-
version "4.3.1"
2183-
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
2184-
integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
2181+
terser@4.3.8:
2182+
version "4.3.8"
2183+
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
2184+
integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
21852185
dependencies:
21862186
commander "^2.20.0"
21872187
source-map "~0.6.1"

‎extensions/csharp/language-configuration.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
["[", "]"],
1414
["(", ")"],
1515
{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
16-
{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
17-
{ "open": "/*", "close": " */", "notIn": ["string"] }
16+
{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] }
1817
],
1918
"surroundingPairs": [
2019
["{", "}"],
@@ -30,4 +29,4 @@
3029
"end": "^\\s*#endregion\\b"
3130
}
3231
}
33-
}
32+
}

‎extensions/css-language-features/server/src/cssServerMain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ const fileSystemProvider: FileSystemProvider = {
7575
let type = FileType.Unknown;
7676
if (stats.isFile()) {
7777
type = FileType.File;
78-
} else if (stats.isDirectory) {
78+
} else if (stats.isDirectory()) {
7979
type = FileType.Directory;
80-
} else if (stats.isSymbolicLink) {
80+
} else if (stats.isSymbolicLink()) {
8181
type = FileType.SymbolicLink;
8282
}
8383

‎extensions/git/package.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,11 @@
362362
"title": "%command.ignore%",
363363
"category": "Git"
364364
},
365+
{
366+
"command": "git.revealInExplorer",
367+
"title": "%command.revealInExplorer%",
368+
"category": "Git"
369+
},
365370
{
366371
"command": "git.stashIncludeUntracked",
367372
"title": "%command.stashIncludeUntracked%",
@@ -507,6 +512,10 @@
507512
"command": "git.restoreCommitTemplate",
508513
"when": "false"
509514
},
515+
{
516+
"command": "git.revealInExplorer",
517+
"when": "false"
518+
},
510519
{
511520
"command": "git.undoCommit",
512521
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -913,6 +922,11 @@
913922
"when": "scmProvider == git && scmResourceGroup == merge",
914923
"group": "inline"
915924
},
925+
{
926+
"command": "git.revealInExplorer",
927+
"when": "scmProvider == git && scmResourceGroup == merge",
928+
"group": "2_view"
929+
},
916930
{
917931
"command": "git.openFile2",
918932
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
@@ -948,6 +962,11 @@
948962
"when": "scmProvider == git && scmResourceGroup == index",
949963
"group": "inline"
950964
},
965+
{
966+
"command": "git.revealInExplorer",
967+
"when": "scmProvider == git && scmResourceGroup == index",
968+
"group": "2_view"
969+
},
951970
{
952971
"command": "git.openFile2",
953972
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
@@ -1007,6 +1026,11 @@
10071026
"command": "git.ignore",
10081027
"when": "scmProvider == git && scmResourceGroup == workingTree",
10091028
"group": "1_modification@3"
1029+
},
1030+
{
1031+
"command": "git.revealInExplorer",
1032+
"when": "scmProvider == git && scmResourceGroup == workingTree",
1033+
"group": "2_view"
10101034
}
10111035
],
10121036
"editor/title": [

‎extensions/git/package.nls.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"command.publish": "Publish Branch",
5757
"command.showOutput": "Show Git Output",
5858
"command.ignore": "Add to .gitignore",
59+
"command.revealInExplorer": "Reveal in Explorer",
5960
"command.stashIncludeUntracked": "Stash (Include Untracked)",
6061
"command.stash": "Stash",
6162
"command.stashPop": "Pop Stash...",

‎extensions/git/src/commands.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,6 +2069,19 @@ export class CommandCenter {
20692069
await this.runByRepository(resources, async (repository, resources) => repository.ignore(resources));
20702070
}
20712071

2072+
@command('git.revealInExplorer')
2073+
async revealInExplorer(resourceState: SourceControlResourceState): Promise<void> {
2074+
if (!resourceState) {
2075+
return;
2076+
}
2077+
2078+
if (!(resourceState.resourceUri instanceof Uri)) {
2079+
return;
2080+
}
2081+
2082+
await commands.executeCommand('revealInExplorer', resourceState.resourceUri);
2083+
}
2084+
20722085
private async _stash(repository: Repository, includeUntracked = false): Promise<void> {
20732086
const noUnstagedChanges = repository.workingTreeGroup.resourceStates.length === 0;
20742087
const noStagedChanges = repository.indexGroup.resourceStates.length === 0;

‎extensions/git/src/util.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export async function mkdirp(path: string, mode?: number): Promise<boolean> {
160160
if (err.code === 'EEXIST') {
161161
const stat = await nfcall<fs.Stats>(fs.stat, path);
162162

163-
if (stat.isDirectory) {
163+
if (stat.isDirectory()) {
164164
return;
165165
}
166166

‎extensions/image-preview/media/main.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
html, body {
7+
width: 100%;
78
height: 100%;
8-
max-height: 100%;
99
text-align: center;
1010
}
1111

‎extensions/json/language-configuration.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
{ "open": "[", "close": "]", "notIn": ["string"] },
1313
{ "open": "(", "close": ")", "notIn": ["string"] },
1414
{ "open": "'", "close": "'", "notIn": ["string"] },
15-
{ "open": "/*", "close": "*/", "notIn": ["string"] },
1615
{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
1716
{ "open": "`", "close": "`", "notIn": ["string", "comment"] }
1817
]
19-
}
18+
}

0 commit comments

Comments
 (0)