Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

register vscode.openWith api #9881

Merged
merged 4 commits into from
Sep 9, 2021
Merged

register vscode.openWith api #9881

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6632ce5
register vscode.openWith api
amos42 Aug 11, 2021
2bb2833
refactoring vscode.openWith api
amos42 Aug 26, 2021
d372111
change openWith logic
amos42 Sep 2, 2021
d123ffc
Refactor CustomEditor opening logic.
amos42 Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change openWith logic 
Signed-off-by: Ju, Gyeong-min <jcmh74@gmail.com>
  • Loading branch information
@amos42
amos42 committed Sep 2, 2021
commit d37211167bbebb1e6372158c4b3745d32c04b79a
20 changes: 8 additions & 12 deletions packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
@inject(MonacoTextModelService)
protected readonly textModelService: MonacoTextModelService;

private async openWith(commandId: string, resource: URI, columnOrOptions?: ViewColumn | TextDocumentShowOptions, viewTypeId?: string): Promise<boolean> {
private async openWith(commandId: string, resource: URI, columnOrOptions?: ViewColumn | TextDocumentShowOptions, openerId?: string): Promise<boolean> {
if (!resource) {
throw new Error(`${commandId} command requires at least URI argument.`);
}
Expand All @@ -159,8 +159,8 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
const editorOptions = DocumentsMainImpl.toEditorOpenerOptions(this.shell, options);

let opener: OpenHandler | undefined;
if (typeof viewTypeId === 'string') {
const lowerViewType = viewTypeId.toLowerCase();
if (typeof openerId === 'string') {
const lowerViewType = openerId.toLowerCase();
const openers = await this.openerService.getOpeners();
for (const opnr of openers) {
const idLowerCase = opnr.id.toLowerCase();
Expand Down Expand Up @@ -194,23 +194,19 @@ export class PluginVscodeCommandsContribution implements CommandContribution {

commands.registerCommand(VscodeCommands.OPEN_WITH, {
isVisible: () => false,
execute: async (resource: URI, viewTypeId: string, columnOrOptions?: ViewColumn | TextDocumentShowOptions) => {
if (!viewTypeId) {
execute: async (resource: URI, viewType: string, columnOrOptions?: ViewColumn | TextDocumentShowOptions) => {
if (!viewType) {
throw new Error(`Running the contributed command: ${VscodeCommands.OPEN_WITH} failed.`);
}

if (viewTypeId.toLowerCase() === 'default') {
if (viewType.toLowerCase() === 'default') {
return commands.executeCommand(VscodeCommands.OPEN.id, resource, columnOrOptions);
}

let result = await this.openWith(VscodeCommands.OPEN_WITH.id, resource, columnOrOptions, viewTypeId);
if (!result) {
// Theia set custom editor id using 'custom-editor-' prefix
result = await this.openWith(VscodeCommands.OPEN_WITH.id, resource, columnOrOptions, `custom-editor-${viewTypeId}`);
}
const result = await this.openWith(VscodeCommands.OPEN_WITH.id, resource, columnOrOptions, `custom-editor-${viewType}`);

if (!result) {
throw new Error(`Could not find an editor for '${viewTypeId}'`);
throw new Error(`Could not find an editor for '${viewType}'`);
}
}
});
Expand Down