ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 09:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode b8c2e7108b3cae7aa2782112da654bedd8bb3a52 (#4808)

Browse Source
This commit is contained in:
Karl Burtram
2019-04-02 14:35:06 -07:00
committed by GitHub
parent e83a6f9c2e
commit f8706abebe
53 changed files with 495 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts
View File

@@ -305,7 +305,7 @@ export class TerminalLinkHandler {
uri = URI.file(linkUrl);
}
return this._fileService.resolveFile(uri).then(stat => {
return this._fileService.resolve(uri).then(stat => {
if (stat.isDirectory) {
return null;
}

2
src/vs/workbench/contrib/terminal/common/terminalService.ts
View File

@@ -416,7 +416,7 @@ export abstract class TerminalService implements ITerminalService {
return Promise.resolve(null);
}
const current = potentialPaths.shift();
return this._fileService.existsFile(URI.file(current!)).then(exists => {
return this._fileService.exists(URI.file(current!)).then(exists => {
if (!exists) {
return this._validateShellPaths(label, potentialPaths);
}

2
src/vs/workbench/contrib/terminal/electron-browser/terminalService.ts
View File

@@ -82,7 +82,7 @@ export class TerminalService extends BrowserTerminalService implements ITerminal
const interval = setInterval(() => {
if (!running) {
running = true;
this._fileService.existsFile(path).then(exists => {
this._fileService.exists(path).then(exists => {
running = false;
if (!exists) {