ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 0fde6619172c9f04c41f2e816479e432cc974b8b (#5199)

Browse Source
This commit is contained in:
Anthony Dresser
2019-04-24 22:26:02 -07:00
committed by GitHub
parent d63f07d29a
commit 34457880c7
86 changed files with 1254 additions and 702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/platform/windows/common/windows.ts
View File

@@ -358,7 +358,7 @@ export const enum ReadyState {
export interface IPath extends IPathData {
// the file path to open within a Code instance
// the file path to open within the instance
fileUri?: URI;
}
@@ -374,7 +374,7 @@ export interface IPathsToWaitForData {
export interface IPathData {
// the file path to open within a Code instance
// the file path to open within the instance
fileUri?: UriComponents;
// the line number in the file path to open
@@ -382,11 +382,15 @@ export interface IPathData {
// the column number in the file path to open
columnNumber?: number;
// a hint that the file exists. if true, the
// file exists, if false it does not. with
// undefined the state is unknown.
exists?: boolean;
}
export interface IOpenFileRequest {
filesToOpen?: IPathData[];
filesToCreate?: IPathData[];
filesToOpenOrCreate?: IPathData[];
filesToDiff?: IPathData[];
filesToWait?: IPathsToWaitForData;
termProgram?: string;
@@ -430,8 +434,7 @@ export interface IWindowConfiguration extends ParsedArgs {
perfWindowLoadTime?: number;
perfEntries: ExportData;
filesToOpen?: IPath[];
filesToCreate?: IPath[];
filesToOpenOrCreate?: IPath[];
filesToDiff?: IPath[];
filesToWait?: IPathsToWaitFor;
termProgram?: string;

6
src/vs/platform/windows/electron-browser/windowsService.ts
View File

@@ -74,9 +74,11 @@ export class WindowsService implements IWindowsService {
return this.channel.call('closeWorkspace', windowId);
}
enterWorkspace(windowId: number, path: URI): Promise<IEnterWorkspaceResult> {
enterWorkspace(windowId: number, path: URI): Promise<IEnterWorkspaceResult | undefined> {
return this.channel.call('enterWorkspace', [windowId, path]).then((result: IEnterWorkspaceResult) => {
result.workspace = reviveWorkspaceIdentifier(result.workspace);
if (result) {
result.workspace = reviveWorkspaceIdentifier(result.workspace);
}
return result;
});
}

2
src/vs/platform/windows/electron-main/windowsService.ts
View File

@@ -176,7 +176,7 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
async getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
this.logService.trace('windowsService#getRecentlyOpened', windowId);
return this.withWindow(windowId, codeWindow => this.historyService.getRecentlyOpened(codeWindow.config.workspace, codeWindow.config.folderUri, codeWindow.config.filesToOpen), () => this.historyService.getRecentlyOpened())!;
return this.withWindow(windowId, codeWindow => this.historyService.getRecentlyOpened(codeWindow.config.workspace, codeWindow.config.folderUri, codeWindow.config.filesToOpenOrCreate), () => this.historyService.getRecentlyOpened())!;
}
async newWindowTab(): Promise<void> {