mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-25 11:08:51 +01:00
Merge branch 'main' into joh/snippetTextEdit
This commit is contained in:
@@ -46,7 +46,7 @@ import { WorkspaceTrustRequestOptions } from 'vs/platform/workspace/common/works
|
||||
import * as tasks from 'vs/workbench/api/common/shared/tasks';
|
||||
import { DataTransferDTO } from 'vs/workbench/api/common/shared/dataTransfer';
|
||||
import { SaveReason } from 'vs/workbench/common/editor';
|
||||
import { IRevealOptions, ITreeItem } from 'vs/workbench/common/views';
|
||||
import { IRevealOptions, ITreeItem, IViewBadge } from 'vs/workbench/common/views';
|
||||
import { CallHierarchyItem } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
|
||||
import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode } from 'vs/workbench/contrib/debug/common/debug';
|
||||
import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
|
||||
@@ -57,7 +57,7 @@ import { OutputChannelUpdateMode } from 'vs/workbench/contrib/output/common/outp
|
||||
import { InputValidationType } from 'vs/workbench/contrib/scm/common/scm';
|
||||
import { IWorkspaceSymbol } from 'vs/workbench/contrib/search/common/search';
|
||||
import { ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable';
|
||||
import { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ISerializedTestResults, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, RunTestForControllerRequest, TestResultState, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testCollection';
|
||||
import { CoverageDetails, ExtensionRunTestsRequest, IFileCoverage, ISerializedTestResults, ITestItem, ITestMessage, ITestRunProfile, ITestRunTask, ResolvedTestRunRequest, RunTestForControllerRequest, TestResultState, TestsDiffOp } from 'vs/workbench/contrib/testing/common/testTypes';
|
||||
import { InternalTimelineOptions, Timeline, TimelineChangeEvent, TimelineOptions, TimelineProviderDescriptor } from 'vs/workbench/contrib/timeline/common/timeline';
|
||||
import { TypeHierarchyItem } from 'vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
|
||||
import { AuthenticationProviderInformation, AuthenticationSession, AuthenticationSessionsChangeEvent } from 'vs/workbench/services/authentication/common/authentication';
|
||||
@@ -262,6 +262,7 @@ export interface MainThreadTreeViewsShape extends IDisposable {
|
||||
$reveal(treeViewId: string, itemInfo: { item: ITreeItem; parentChain: ITreeItem[] } | undefined, options: IRevealOptions): Promise<void>;
|
||||
$setMessage(treeViewId: string, message: string): void;
|
||||
$setTitle(treeViewId: string, title: string, description: string | undefined): void;
|
||||
$setBadge(treeViewId: string, badge: IViewBadge | undefined): void;
|
||||
}
|
||||
|
||||
export interface MainThreadDownloadServiceShape extends IDisposable {
|
||||
@@ -622,7 +623,8 @@ export const enum TabInputKind {
|
||||
|
||||
export const enum TabModelOperationKind {
|
||||
TAB_OPEN,
|
||||
TAB_CLOSE
|
||||
TAB_CLOSE,
|
||||
TAB_UPDATE
|
||||
}
|
||||
|
||||
export interface UnknownInputDto {
|
||||
@@ -686,9 +688,11 @@ export interface IEditorTabGroupDto {
|
||||
}
|
||||
|
||||
export interface TabOperation {
|
||||
readonly kind: TabModelOperationKind.TAB_OPEN | TabModelOperationKind.TAB_CLOSE;
|
||||
readonly kind: TabModelOperationKind.TAB_OPEN | TabModelOperationKind.TAB_CLOSE | TabModelOperationKind.TAB_UPDATE;
|
||||
// TODO @lramos15 Possibly get rid of index for tab update, it's only needed for open and close
|
||||
readonly index: number;
|
||||
readonly tab: IEditorTabDto;
|
||||
readonly tabDto: IEditorTabDto;
|
||||
readonly groupId: number;
|
||||
}
|
||||
|
||||
export interface IEditorTabDto {
|
||||
@@ -707,8 +711,8 @@ export interface IExtHostEditorTabsShape {
|
||||
$acceptEditorTabModel(tabGroups: IEditorTabGroupDto[]): void;
|
||||
// Only when group property changes (not the tabs inside)
|
||||
$acceptTabGroupUpdate(groupDto: IEditorTabGroupDto): void;
|
||||
// Only when tab property changes
|
||||
$acceptTabUpdate(groupId: number, tabDto: IEditorTabDto): void;
|
||||
// When a tab is added, removed, or updated
|
||||
$acceptTabOperation(operation: TabOperation): void;
|
||||
}
|
||||
|
||||
//#endregion
|
||||
@@ -831,6 +835,7 @@ export interface MainThreadWebviewViewsShape extends IDisposable {
|
||||
|
||||
$setWebviewViewTitle(handle: WebviewHandle, value: string | undefined): void;
|
||||
$setWebviewViewDescription(handle: WebviewHandle, value: string | undefined): void;
|
||||
$setWebviewViewBadge(handle: WebviewHandle, badge: IViewBadge | undefined): void;
|
||||
|
||||
$show(handle: WebviewHandle, preserveFocus: boolean): void;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user