Skip to content

Finalize paste api and drop api tweaks #237443

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

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Finalize paste api and drop api tweaks #237443

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions extensions/css-language-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"supported": true
}
},
"enabledApiProposals": [
"documentPaste"
],
"scripts": {
"compile": "npx gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
"watch": "npx gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
Expand Down
1 change: 0 additions & 1 deletion extensions/ipynb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"vscode": "^1.57.0"
},
"enabledApiProposals": [
"documentPaste",
"diffContentOptions"
],
"activationEvents": [
Expand Down
3 changes: 0 additions & 3 deletions extensions/markdown-language-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"categories": [
"Programming Languages"
],
"enabledApiProposals": [
"documentPaste"
],
"activationEvents": [
"onLanguage:markdown",
"onCommand:markdown.api.render",
Expand Down
1 change: 0 additions & 1 deletion extensions/typescript-language-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"mappedEditsProvider",
"codeActionAI",
"codeActionRanges",
"documentPaste",
"editorHoverVerbosityLevel"
],
"capabilities": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const enabledSettingId = 'updateImportsOnPaste.enabled';

class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {

static readonly kind = vscode.DocumentDropOrPasteEditKind.Text.append('updateImports', 'jsts');
static readonly kind = vscode.DocumentDropOrPasteEditKind.TextUpdateImports.append('jsts');
static readonly metadataMimeType = 'application/vnd.code.jsts.metadata';

constructor(
Expand Down
1 change: 0 additions & 1 deletion extensions/vscode-api-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"defaultChatParticipant",
"diffCommand",
"documentFiltersExclusive",
"documentPaste",
"editorInsets",
"embeddings",
"extensionRuntime",
Expand Down
3 changes: 0 additions & 3 deletions src/vs/platform/extensions/common/extensionsApiProposals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ const _allApiProposals = {
documentFiltersExclusive: {
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts',
},
documentPaste: {
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentPaste.d.ts',
},
editSessionIdentityProvider: {
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
},
Expand Down
3 changes: 1 addition & 2 deletions src/vs/workbench/api/common/extHost.api.impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostLanguageFeatures.registerCodeActionProvider(extension, checkSelector(selector), provider, metadata);
},
registerDocumentPasteEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentPasteEditProvider, metadata: vscode.DocumentPasteProviderMetadata): vscode.Disposable {
checkProposedApiEnabled(extension, 'documentPaste');
return extHostLanguageFeatures.registerDocumentPasteEditProvider(extension, checkSelector(selector), provider, metadata);
},
registerCodeLensProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
Expand Down Expand Up @@ -669,7 +668,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostLanguages.createLanguageStatusItem(extension, id, selector);
},
registerDocumentDropEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentDropEditProvider, metadata?: vscode.DocumentDropEditProviderMetadata): vscode.Disposable {
return extHostLanguageFeatures.registerDocumentOnDropEditProvider(extension, selector, provider, isProposedApiEnabled(extension, 'documentPaste') ? metadata : undefined);
return extHostLanguageFeatures.registerDocumentOnDropEditProvider(extension, selector, provider, metadata);
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/api/common/extHostLanguageFeatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2914,7 +2914,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
const handle = this._nextHandle();
this._adapter.set(handle, new AdapterData(new DocumentDropEditAdapter(this._proxy, this._documents, provider, handle, extension), extension));

this._proxy.$registerDocumentOnDropEditProvider(handle, this._transformDocumentSelector(selector, extension), isProposedApiEnabled(extension, 'documentPaste') && metadata ? {
this._proxy.$registerDocumentOnDropEditProvider(handle, this._transformDocumentSelector(selector, extension), metadata ? {
supportsResolve: !!provider.resolveDocumentDropEdit,
dropMimeTypes: metadata.dropMimeTypes,
providedDropKinds: metadata.providedDropEditKinds?.map(x => x.value),
Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/api/common/extHostTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2950,6 +2950,7 @@ export enum DocumentPasteTriggerKind {
export class DocumentDropOrPasteEditKind {
static Empty: DocumentDropOrPasteEditKind;
static Text: DocumentDropOrPasteEditKind;
static TextUpdateImports: DocumentDropOrPasteEditKind;

private static sep = '.';

Expand All @@ -2971,6 +2972,7 @@ export class DocumentDropOrPasteEditKind {
}
DocumentDropOrPasteEditKind.Empty = new DocumentDropOrPasteEditKind('');
DocumentDropOrPasteEditKind.Text = new DocumentDropOrPasteEditKind('text');
DocumentDropOrPasteEditKind.TextUpdateImports = DocumentDropOrPasteEditKind.Text.append('updateImports');

export class DocumentPasteEdit {

Expand Down
Loading
Loading