Make splitting respect supportMultipleDocument (#120263)

* Make splitting respect supportMultipleDocument * Make split move the unsupported editor in the direction of the split * Make it always split an empty group if the editor doesn't support splitting
microsoft · Apr 7, 2021 · fe10639 · fe10639
1 parent bb6757b
commit fe10639
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -632,12 +632,13 @@ export function splitEditor(editorGroupService: IEditorGroupsService, direction:
 		editorToCopy = withNullAsUndefined(sourceGroup.activeEditor);
 	}
 
+	// Copy the editor to the new group, else move the editor to the new group
 	if (editorToCopy && (editorToCopy as EditorInput).supportsSplitEditor()) {
 		sourceGroup.copyEditor(editorToCopy, newGroup);
+		// Focus
+		newGroup.focus();
 	}
 
-	// Focus
-	newGroup.focus();
 }
 
 function registerSplitEditorCommands() {

diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
@@ -90,7 +90,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 	}
 
 	public supportsSplitEditor() {
-		return true;
+		return !!this.customEditorService.getCustomEditorCapabilities(this.viewType)?.supportsMultipleEditorsPerDocument;
 	}
 
 	getName(): string {

diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -199,7 +199,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		});
 	}
 
-	private getCustomEditorCapabilities(viewType: string): CustomEditorCapabilities | undefined {
+	public getCustomEditorCapabilities(viewType: string): CustomEditorCapabilities | undefined {
 		return this._editorCapabilities.get(viewType);
 	}
 

diff --git a/src/vs/workbench/contrib/customEditor/common/customEditor.ts b/src/vs/workbench/contrib/customEditor/common/customEditor.ts
@@ -44,6 +44,7 @@ export interface ICustomEditorService {
 	openWith(resource: URI, customEditorViewType: string, options?: ITextEditorOptions, group?: IEditorGroup): Promise<IEditorPane | undefined>;
 
 	registerCustomEditorCapabilities(viewType: string, options: CustomEditorCapabilities): IDisposable;
+	getCustomEditorCapabilities(viewType: string): CustomEditorCapabilities | undefined
 }
 
 export interface ICustomEditorModelManager {