Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into joh/langStatus

Browse Source
This commit is contained in:
Johannes Rieken
2021-08-25 14:24:44 +02:00
parent bdbcd48316 3265924678
commit 4baebf9ea0
127 changed files with 1688 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -292,7 +292,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
get language() { return initData.environment.appLanguage; },
get appName() { return initData.environment.appName; },
get appRoot() { return initData.environment.appRoot?.fsPath ?? ''; },
get embedderIdentifier() { return initData.environment.embedderIdentifier; },
get appHost() { return initData.environment.appHost; },
get uriScheme() { return initData.environment.appUriScheme; },
get clipboard(): vscode.Clipboard { return extHostClipboard.value; },
get shell() {

2
src/vs/workbench/api/common/extHost.protocol.ts
View File

@@ -72,7 +72,7 @@ import * as search from 'vs/workbench/services/search/common/search';
export interface IEnvironment {
isExtensionDevelopmentDebug: boolean;
appName: string;
embedderIdentifier: string;
appHost: string;
appRoot?: URI;
appLanguage: string;
appUriScheme: string;

15
src/vs/workbench/api/common/extHostTerminalService.ts
View File

@@ -52,7 +52,10 @@ export interface ITerminalInternalOptions {
isFeatureTerminal?: boolean;
useShellEnvironment?: boolean;
resolvedExtHostIdentifier?: ExtHostTerminalIdentifier;
splitActiveTerminal?: boolean;
/**
* This location is different from the API location because it can include splitActiveTerminal,
* a property we resolve internally
*/
location?: TerminalLocation | { viewColumn: number, preserveState?: boolean } | { splitActiveTerminal: boolean };
}
@@ -171,7 +174,7 @@ export class ExtHostTerminal {
return this._id;
}
private _serializeParentTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions | { splitActiveTerminal: boolean }, parentTerminal?: ExtHostTerminalIdentifier, internalLocation?: TerminalLocation | { viewColumn: number, preserveState?: boolean } | { splitActiveTerminal: boolean }): TerminalLocation | vscode.TerminalEditorLocationOptions | { parentTerminal: ExtHostTerminalIdentifier } | { splitActiveTerminal: boolean, location?: TerminalLocation } | vscode.TerminalEditorLocationOptions | undefined {
private _serializeParentTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions | { splitActiveTerminal: boolean }, parentTerminal?: ExtHostTerminalIdentifier, internalLocation?: TerminalLocation | { viewColumn: number, preserveState?: boolean } | { splitActiveTerminal: boolean }): TerminalLocation | vscode.TerminalEditorLocationOptions | { parentTerminal: ExtHostTerminalIdentifier } | { splitActiveTerminal: boolean } | vscode.TerminalEditorLocationOptions | undefined {
if (typeof location === 'object' && 'parentTerminal' in location) {
return parentTerminal ? { parentTerminal } : undefined;
} else if (internalLocation) {
@@ -411,8 +414,14 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
}
private _resolveLocation(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions): undefined | TerminalLocation | vscode.TerminalEditorLocationOptions {
if (typeof location === 'object' && 'parentTerminal' in location) {
if (typeof location === 'object' && 'viewColumn' in location && location.viewColumn !== undefined) {
return { viewColumn: location.viewColumn, preserveFocus: location.preserveFocus };
} else if (typeof location === 'object' && 'parentTerminal' in location) {
// parent terminal exthost ID is passed in internal options
// for conversion to TerminalInstance in mainThreadTerminalService
return undefined;
} else if (location === TerminalLocation.Editor || location === TerminalLocation.Panel) {
return location;
}
return location;
}

4
src/vs/workbench/api/common/extHostTypes.ts
View File

@@ -1736,8 +1736,8 @@ export class TerminalLink implements vscode.TerminalLink {
}
export enum TerminalLocation {
Panel = 0,
Editor = 1,
Panel = 1,
Editor = 2,
}
export class TerminalProfile implements vscode.TerminalProfile {