diff --git a/extensions/extension-editing/src/extensionEditingMain.ts b/extensions/extension-editing/src/extensionEditingMain.ts index c056fbfa975..9dc71a46896 100644 --- a/extensions/extension-editing/src/extensionEditingMain.ts +++ b/extensions/extension-editing/src/extensionEditingMain.ts @@ -12,12 +12,10 @@ export function activate(context: vscode.ExtensionContext) { //package.json suggestions context.subscriptions.push(registerPackageDocumentCompletions()); - //package.json code actions for lint warnings - context.subscriptions.push(registerCodeActionsProvider()); - context.subscriptions.push(new ExtensionLinter()); } + function registerPackageDocumentCompletions(): vscode.Disposable { return vscode.languages.registerCompletionItemProvider({ language: 'json', pattern: '**/package.json' }, { provideCompletionItems(document, position, token) { @@ -25,11 +23,3 @@ function registerPackageDocumentCompletions(): vscode.Disposable { } }); } - -function registerCodeActionsProvider(): vscode.Disposable { - return vscode.languages.registerCodeActionsProvider({ language: 'json', pattern: '**/package.json' }, { - provideCodeActions(document, range, context, token) { - return new PackageDocument(document).provideCodeActions(range, context, token); - } - }); -} diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts index 2731f59b914..459bd9a8e16 100644 --- a/extensions/extension-editing/src/extensionLinter.ts +++ b/extensions/extension-editing/src/extensionLinter.ts @@ -32,8 +32,8 @@ const dataUrlsNotValid = l10n.t("Data URLs are not a valid image source."); const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a repository with HTTPS protocol to be specified in the package.json."); const relativeBadgeUrlRequiresHttpsRepository = l10n.t("Relative badge URLs require a repository with HTTPS protocol to be specified in this package.json."); const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the VS Code team."); -export const implicitActivationEvent = l10n.t("This activation event cannot be explicitly listed by your extension."); -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations."); +const implicitActivationEvent = l10n.t("This activation event cannot be explicitly listed by your extension."); +const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations."); const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as VS Code will generate these automatically from your package.json contribution declarations."); const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance."); const parsingErrorHeader = l10n.t("Error parsing the when-clause:"); diff --git a/extensions/extension-editing/src/packageDocumentHelper.ts b/extensions/extension-editing/src/packageDocumentHelper.ts index 6039bf0484d..67163900b5b 100644 --- a/extensions/extension-editing/src/packageDocumentHelper.ts +++ b/extensions/extension-editing/src/packageDocumentHelper.ts @@ -5,7 +5,6 @@ import * as vscode from 'vscode'; import { getLocation, Location } from 'jsonc-parser'; -import { implicitActivationEvent, redundantImplicitActivationEvent } from './extensionLinter'; export class PackageDocument { @@ -22,24 +21,6 @@ export class PackageDocument { return undefined; } - public provideCodeActions(_range: vscode.Range, context: vscode.CodeActionContext, _token: vscode.CancellationToken): vscode.ProviderResult { - const codeActions: vscode.CodeAction[] = []; - for (const diagnostic of context.diagnostics) { - if (diagnostic.message === implicitActivationEvent || diagnostic.message === redundantImplicitActivationEvent) { - const codeAction = new vscode.CodeAction(vscode.l10n.t("Remove activation event"), vscode.CodeActionKind.QuickFix); - codeAction.edit = new vscode.WorkspaceEdit(); - const rangeForCharAfter = diagnostic.range.with(diagnostic.range.end, diagnostic.range.end.translate(0, 1)); - if (this.document.getText(rangeForCharAfter) === ',') { - codeAction.edit.delete(this.document.uri, diagnostic.range.with(undefined, diagnostic.range.end.translate(0, 1))); - } else { - codeAction.edit.delete(this.document.uri, diagnostic.range); - } - codeActions.push(codeAction); - } - } - return codeActions; - } - private provideLanguageOverridesCompletionItems(location: Location, position: vscode.Position): vscode.ProviderResult { let range = this.getReplaceRange(location, position); const text = this.document.getText(range);