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

Jump to bottom

Use active editor and show progress when sharing #183603

Merged
merged 1 commit into from May 26, 2023
Merged

Use active editor and show progress when sharing #183603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/vs/workbench/contrib/share/browser/share.contribution.ts
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/acti
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
Expand All @@ -26,6 +27,8 @@ import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common
import { ShareProviderCountContext, ShareService } from 'vs/workbench/contrib/share/browser/shareService';
import { IShareService } from 'vs/workbench/contrib/share/common/share';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';

const targetMenus = [
MenuId.EditorContextShare,
Expand Down Expand Up @@ -73,15 +76,23 @@ class ShareWorkbenchContribution {

override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
const shareService = accessor.get(IShareService);
const resourceUri = accessor.get(IWorkspaceContextService).getWorkspace().folders[0].uri;
const activeEditor = accessor.get(IEditorService)?.activeEditor;
const resourceUri = (activeEditor && EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }))
?? accessor.get(IWorkspaceContextService).getWorkspace().folders[0].uri;
const clipboardService = accessor.get(IClipboardService);
const dialogService = accessor.get(IDialogService);
const urlService = accessor.get(IOpenerService);
const progressService = accessor.get(IProgressService);

const uri = await shareService.provideShare({ resourceUri }, new CancellationTokenSource().token);
if (uri) {
const uriText = uri.toString();
await clipboardService.writeText(uriText);

await progressService.withProgress({
location: ProgressLocation.Window,
detail: localize('generating link', 'Generating link...')
}, () => clipboardService.writeText(uriText));

dialogService.prompt(
{
type: Severity.Info,
Expand Down