diff --git a/extensions/npm/src/features/bowerJSONContribution.ts b/extensions/npm/src/features/bowerJSONContribution.ts index 300d7dad1f080fbd4f7956814d7d96fafa5953f5..099dd47290535161e49f15d98b555b8ff7831e57 100644 --- a/extensions/npm/src/features/bowerJSONContribution.ts +++ b/extensions/npm/src/features/bowerJSONContribution.ts @@ -5,7 +5,7 @@ 'use strict'; import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode'; -import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions'; +import { IJSONContribution, ISuggestionsCollector } from './jsonContributions'; import { XHRRequest } from 'request-light'; import { Location } from 'jsonc-parser'; import { textToMarkedString } from './markedTextUtil'; diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts index 38e4ce05310d5937b1baf1927961f6d043e792ec..ca74b4c2d25656e63581df00dad0f603aa0b21ae 100644 --- a/extensions/npm/src/features/packageJSONContribution.ts +++ b/extensions/npm/src/features/packageJSONContribution.ts @@ -5,7 +5,7 @@ 'use strict'; import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode'; -import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions'; +import { IJSONContribution, ISuggestionsCollector } from './jsonContributions'; import { XHRRequest } from 'request-light'; import { Location } from 'jsonc-parser'; import { textToMarkedString } from './markedTextUtil'; diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts index 5b0df1c482719dbc8fbaf6122f5917daeb9666f9..7cf3ef7b77a3a7295d65bb286f22567058a277b6 100644 --- a/extensions/npm/src/main.ts +++ b/extensions/npm/src/main.ts @@ -13,9 +13,9 @@ import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHov import { runSelectedScript } from './commands'; export async function activate(context: vscode.ExtensionContext): Promise { - const taskProvider = registerTaskProvider(context); + registerTaskProvider(context); const treeDataProvider = registerExplorer(context); - const hoverProvider = registerHoverProvider(context); + registerHoverProvider(context); configureHttpRequest(); let d = vscode.workspace.onDidChangeConfiguration((e) => { @@ -59,7 +59,7 @@ function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposab let workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches()); context.subscriptions.push(workspaceWatcher); - let provider: vscode.TaskProvider = new NpmTaskProvider(context); + let provider: vscode.TaskProvider = new NpmTaskProvider(); let disposable = vscode.workspace.registerTaskProvider('npm', provider); context.subscriptions.push(disposable); return disposable; diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts index 4947aa6fa5a7e500e3eb45a0718ab5719ac2ae0b..b4e2e5e74eeec85ffccaaaa06f13c0df0790964f 100644 --- a/extensions/npm/src/npmView.ts +++ b/extensions/npm/src/npmView.ts @@ -43,7 +43,7 @@ class PackageJSON extends TreeItem { folder: Folder; scripts: NpmScript[] = []; - static getLabel(folderName: string, relativePath: string): string { + static getLabel(_folderName: string, relativePath: string): string { if (relativePath.length > 0) { return path.join(relativePath, packageName); } @@ -338,7 +338,6 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { folder.addPackage(packageJson); packages.set(fullPath, packageJson); } - let fullScriptPath = path.join(packageJson.path, each.name); let script = new NpmScript(this.extensionContext, packageJson, each); packageJson.addScript(script); } diff --git a/extensions/npm/src/scriptHover.ts b/extensions/npm/src/scriptHover.ts index d81ceee08072a756743415889ca627b38f1aab74..341f0e8a14db38740c4f33d665b994b87853558a 100644 --- a/extensions/npm/src/scriptHover.ts +++ b/extensions/npm/src/scriptHover.ts @@ -29,10 +29,8 @@ export function invalidateHoverScriptsCache(document?: TextDocument) { } export class NpmScriptHoverProvider implements HoverProvider { - private extensionContext: ExtensionContext; constructor(context: ExtensionContext) { - this.extensionContext = context; context.subscriptions.push(commands.registerCommand('npm.runScriptFromHover', this.runScriptFromHover, this)); context.subscriptions.push(commands.registerCommand('npm.debugScriptFromHover', this.debugScriptFromHover, this)); } diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts index 8124f43337607e8ecb51c190d685ef3818311650..31b9fea69a2f74c4533ab355af09bf0a944c8872 100644 --- a/extensions/npm/src/tasks.ts +++ b/extensions/npm/src/tasks.ts @@ -6,7 +6,7 @@ import { TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace, - DebugConfiguration, debug, TaskProvider, ExtensionContext, TextDocument, tasks + DebugConfiguration, debug, TaskProvider, TextDocument, tasks } from 'vscode'; import * as path from 'path'; import * as fs from 'fs'; @@ -26,10 +26,8 @@ type AutoDetect = 'on' | 'off'; let cachedTasks: Task[] | undefined = undefined; export class NpmTaskProvider implements TaskProvider { - private extensionContext: ExtensionContext; - constructor(context: ExtensionContext) { - this.extensionContext = context; + constructor() { } public provideTasks() { @@ -373,7 +371,7 @@ async function findAllScripts(buffer: string): Promise { } else if (inScripts && !script) { script = property; - } else { // nested object which is invalid, ignore the script + } else { // nested object which is invalid, ignore the script script = undefined; } } @@ -444,14 +442,14 @@ export function findScriptAtPosition(buffer: string, offset: number): string | u } } }, - onObjectProperty(property: string, nodeOffset: number, nodeLength: number) { + onObjectProperty(property: string, nodeOffset: number) { if (property === 'scripts') { inScripts = true; } else if (inScripts) { scriptStart = nodeOffset; script = property; - } else { // nested object which is invalid, ignore the script + } else { // nested object which is invalid, ignore the script script = undefined; } } diff --git a/extensions/npm/tsconfig.json b/extensions/npm/tsconfig.json index 52b567f3225a523c07153cebbbc886836368e795..296ddb38fcb3041da36e555dff63eefa23bcb886 100644 --- a/extensions/npm/tsconfig.json +++ b/extensions/npm/tsconfig.json @@ -1,14 +1,7 @@ { + "extends": "../shared.tsconfig.json", "compilerOptions": { - "target": "es6", - "module": "commonjs", - "lib": [ - "es2016" - ], - "outDir": "./out", - "noImplicitAny": true, - "noImplicitReturns": true, - "strict": true + "outDir": "./out" }, "include": [ "src/**/*"