Skip to content

Commit 936742b

Browse files
mjbvzmjbvz
committed
Onboard npm to use shared tsconfig
1 parent 6769079 commit 936742b

7 files changed

Lines changed: 13 additions & 25 deletions

File tree

‎extensions/npm/src/features/bowerJSONContribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
8-
import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions';
8+
import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
99
import { XHRRequest } from 'request-light';
1010
import { Location } from 'jsonc-parser';
1111
import { textToMarkedString } from './markedTextUtil';

‎extensions/npm/src/features/packageJSONContribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import { MarkedString, CompletionItemKind, CompletionItem, DocumentSelector, SnippetString, workspace } from 'vscode';
8-
import { IJSONContribution, ISuggestionsCollector, xhrDisabled } from './jsonContributions';
8+
import { IJSONContribution, ISuggestionsCollector } from './jsonContributions';
99
import { XHRRequest } from 'request-light';
1010
import { Location } from 'jsonc-parser';
1111
import { textToMarkedString } from './markedTextUtil';

‎extensions/npm/src/main.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHov
1313
import { runSelectedScript } from './commands';
1414

1515
export async function activate(context: vscode.ExtensionContext): Promise<void> {
16-
const taskProvider = registerTaskProvider(context);
16+
registerTaskProvider(context);
1717
const treeDataProvider = registerExplorer(context);
18-
const hoverProvider = registerHoverProvider(context);
18+
registerHoverProvider(context);
1919

2020
configureHttpRequest();
2121
let d = vscode.workspace.onDidChangeConfiguration((e) => {
@@ -59,7 +59,7 @@ function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposab
5959
let workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches());
6060
context.subscriptions.push(workspaceWatcher);
6161

62-
let provider: vscode.TaskProvider = new NpmTaskProvider(context);
62+
let provider: vscode.TaskProvider = new NpmTaskProvider();
6363
let disposable = vscode.workspace.registerTaskProvider('npm', provider);
6464
context.subscriptions.push(disposable);
6565
return disposable;

‎extensions/npm/src/npmView.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class PackageJSON extends TreeItem {
4343
folder: Folder;
4444
scripts: NpmScript[] = [];
4545

46-
static getLabel(folderName: string, relativePath: string): string {
46+
static getLabel(_folderName: string, relativePath: string): string {
4747
if (relativePath.length > 0) {
4848
return path.join(relativePath, packageName);
4949
}
@@ -338,7 +338,6 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
338338
folder.addPackage(packageJson);
339339
packages.set(fullPath, packageJson);
340340
}
341-
let fullScriptPath = path.join(packageJson.path, each.name);
342341
let script = new NpmScript(this.extensionContext, packageJson, each);
343342
packageJson.addScript(script);
344343
}

‎extensions/npm/src/scriptHover.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ export function invalidateHoverScriptsCache(document?: TextDocument) {
2929
}
3030

3131
export class NpmScriptHoverProvider implements HoverProvider {
32-
private extensionContext: ExtensionContext;
3332

3433
constructor(context: ExtensionContext) {
35-
this.extensionContext = context;
3634
context.subscriptions.push(commands.registerCommand('npm.runScriptFromHover', this.runScriptFromHover, this));
3735
context.subscriptions.push(commands.registerCommand('npm.debugScriptFromHover', this.debugScriptFromHover, this));
3836
}

‎extensions/npm/src/tasks.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import {
88
TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace,
9-
DebugConfiguration, debug, TaskProvider, ExtensionContext, TextDocument, tasks
9+
DebugConfiguration, debug, TaskProvider, TextDocument, tasks
1010
} from 'vscode';
1111
import * as path from 'path';
1212
import * as fs from 'fs';
@@ -26,10 +26,8 @@ type AutoDetect = 'on' | 'off';
2626
let cachedTasks: Task[] | undefined = undefined;
2727

2828
export class NpmTaskProvider implements TaskProvider {
29-
private extensionContext: ExtensionContext;
3029

31-
constructor(context: ExtensionContext) {
32-
this.extensionContext = context;
30+
constructor() {
3331
}
3432

3533
public provideTasks() {
@@ -373,7 +371,7 @@ async function findAllScripts(buffer: string): Promise<StringMap> {
373371
}
374372
else if (inScripts && !script) {
375373
script = property;
376-
} else { // nested object which is invalid, ignore the script
374+
} else { // nested object which is invalid, ignore the script
377375
script = undefined;
378376
}
379377
}
@@ -444,14 +442,14 @@ export function findScriptAtPosition(buffer: string, offset: number): string | u
444442
}
445443
}
446444
},
447-
onObjectProperty(property: string, nodeOffset: number, nodeLength: number) {
445+
onObjectProperty(property: string, nodeOffset: number) {
448446
if (property === 'scripts') {
449447
inScripts = true;
450448
}
451449
else if (inScripts) {
452450
scriptStart = nodeOffset;
453451
script = property;
454-
} else { // nested object which is invalid, ignore the script
452+
} else { // nested object which is invalid, ignore the script
455453
script = undefined;
456454
}
457455
}

‎extensions/npm/tsconfig.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
{
2+
"extends": "../shared.tsconfig.json",
23
"compilerOptions": {
3-
"target": "es6",
4-
"module": "commonjs",
5-
"lib": [
6-
"es2016"
7-
],
8-
"outDir": "./out",
9-
"noImplicitAny": true,
10-
"noImplicitReturns": true,
11-
"strict": true
4+
"outDir": "./out"
125
},
136
"include": [
147
"src/**/*"

0 commit comments

Comments
 (0)