Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support untitled with associated resource in vscode.open (#139194)

Browse Source 
* wip

* 💄

* add test

* comments

* skip flaky test

* Revert "skip flaky test"

This reverts commit 94c712500e.
This commit is contained in:
Benjamin Pasero
2021-12-15 14:38:07 +01:00
committed by GitHub
parent 9df559fdbb
commit 8f7589750a
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts
View File

@@ -116,4 +116,12 @@ suite('vscode API - commands', () => {
return Promise.all([a, b, c, d]);
});
test('api-command: vscode.open with untitled supports associated resource (#138925)', async function () {
let uri = Uri.parse(workspace.workspaceFolders![0].uri.toString() + '/far-copy.js').with({ scheme: 'untitled' });
await commands.executeCommand('vscode.open', uri).then(() => assert.ok(true), () => assert.ok(false));
// untitled with associated resource are dirty from the beginning
assert.ok(window.activeTextEditor?.document.isDirty);
});
});

27
src/vs/workbench/browser/parts/editor/editorCommands.ts
View File

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
import { isObject, isString, isUndefined, isNumber, withNullAsUndefined } from 'vs/base/common/types';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { TextCompareEditorVisibleContext, IEditorIdentifier, IEditorCommandsContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, CloseDirection, IVisibleEditorPane, ActiveEditorStickyContext, EditorsOrder, EditorInputCapabilities, isEditorIdentifier, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, GroupIdentifier, TextCompareEditorActiveContext, SideBySideEditorActiveContext, isEditorInputWithOptionsAndGroup } from 'vs/workbench/common/editor';
import { TextCompareEditorVisibleContext, IEditorIdentifier, IEditorCommandsContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, CloseDirection, IVisibleEditorPane, ActiveEditorStickyContext, EditorsOrder, EditorInputCapabilities, isEditorIdentifier, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, GroupIdentifier, TextCompareEditorActiveContext, SideBySideEditorActiveContext, isEditorInputWithOptionsAndGroup, IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { EditorGroupColumn, columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
import { ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
@@ -27,12 +27,13 @@ import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vs/platform/acti
import { CATEGORIES } from 'vs/workbench/common/actions';
import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/browser/parts/editor/editorQuickAccess';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { EditorResolution, IEditorOptions, ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { EditorResolution, IEditorOptions, IResourceEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { Schemas } from 'vs/base/common/network';
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
import { IPathService } from 'vs/workbench/services/path/common/pathService';
export const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
@@ -494,15 +495,31 @@ function registerOpenEditorAPICommands(): void {
const editorService = accessor.get(IEditorService);
const editorGroupService = accessor.get(IEditorGroupsService);
const openerService = accessor.get(IOpenerService);
const pathService = accessor.get(IPathService);
const resource = URI.revive(resourceArg);
const [columnArg, optionsArg] = columnAndOptions ?? [];
// use editor options or editor view column as a hint to use the editor service for opening
if (optionsArg || typeof columnArg === 'number') {
// use editor options or editor view column or resource scheme
// as a hint to use the editor service for opening directly
if (optionsArg || typeof columnArg === 'number' || resource.scheme === Schemas.untitled) {
const [options, column] = mixinContext(context, optionsArg, columnArg);
await editorService.openEditor({ resource, options, label }, columnToEditorGroup(editorGroupService, column));
let input: IResourceEditorInput | IUntitledTextResourceEditorInput;
if (resource.scheme === Schemas.untitled && resource.path.length > 1) {
// special case for untitled: we are getting a resource with meaningful
// path from an extension to use for the untitled editor. as such, we
// have to assume it as an associated resource to use when saving. we
// do so by setting the `forceUntitled: true` and changing the scheme
// to a file based one. the untitled editor service takes care to
// associate the path properly then.
input = { resource: resource.with({ scheme: pathService.defaultUriScheme }), forceUntitled: true, options, label };
} else {
// use any other resource as is
input = { resource, options, label };
}
await editorService.openEditor(input, columnToEditorGroup(editorGroupService, column));
}
// do not allow to execute commands from here