Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-26 13:19:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto-fixed prefer-const violation

Browse Source
This commit is contained in:
Johannes
2022-06-08 17:49:21 +02:00
parent aa23a0dbb7
commit 0656d21d11
862 changed files with 6489 additions and 6489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/npm/src/commands.ts
View File

@@ -16,17 +16,17 @@ import {
const localize = nls.loadMessageBundle();
export function runSelectedScript(context: vscode.ExtensionContext) {
let editor = vscode.window.activeTextEditor;
const editor = vscode.window.activeTextEditor;
if (!editor) {
return;
}
let document = editor.document;
let contents = document.getText();
let script = findScriptAtPosition(editor.document, contents, editor.selection.anchor);
const document = editor.document;
const contents = document.getText();
const script = findScriptAtPosition(editor.document, contents, editor.selection.anchor);
if (script) {
runScript(context, script, document);
} else {
let message = localize('noScriptFound', 'Could not find a valid npm script at the selection.');
const message = localize('noScriptFound', 'Could not find a valid npm script at the selection.');
vscode.window.showErrorMessage(message);
}
}
@@ -37,7 +37,7 @@ export async function selectAndRunScriptFromFolder(context: vscode.ExtensionCont
}
const selectedFolder = selectedFolders[0];
let taskList: IFolderTaskItem[] = await detectNpmScriptsForFolder(context, selectedFolder);
const taskList: IFolderTaskItem[] = await detectNpmScriptsForFolder(context, selectedFolder);
if (taskList && taskList.length > 0) {
const quickPick = vscode.window.createQuickPick<IFolderTaskItem>();
@@ -47,7 +47,7 @@ export async function selectAndRunScriptFromFolder(context: vscode.ExtensionCont
const toDispose: vscode.Disposable[] = [];
let pickPromise = new Promise<IFolderTaskItem | undefined>((c) => {
const pickPromise = new Promise<IFolderTaskItem | undefined>((c) => {
toDispose.push(quickPick.onDidAccept(() => {
toDispose.forEach(d => d.dispose());
c(quickPick.selectedItems[0]);
@@ -58,7 +58,7 @@ export async function selectAndRunScriptFromFolder(context: vscode.ExtensionCont
}));
});
quickPick.show();
let result = await pickPromise;
const result = await pickPromise;
quickPick.dispose();
if (result) {
vscode.tasks.executeTask(result.task);

12
extensions/npm/src/features/packageJSONContribution.ts
View File

@@ -78,7 +78,7 @@ export class PackageJSONContribution implements IJSONContribution {
if (currentWord.indexOf('/') !== -1) {
return this.collectScopedPackages(currentWord, addValue, isLast, collector);
}
for (let scope of this.knownScopes) {
for (const scope of this.knownScopes) {
const proposal = new CompletionItem(scope);
proposal.kind = CompletionItemKind.Property;
proposal.insertText = new SnippetString().appendText(`"${scope}/`).appendTabstop().appendText('"');
@@ -146,14 +146,14 @@ export class PackageJSONContribution implements IJSONContribution {
}
private collectScopedPackages(currentWord: string, addValue: boolean, isLast: boolean, collector: ISuggestionsCollector): Thenable<any> {
let segments = currentWord.split('/');
const segments = currentWord.split('/');
if (segments.length === 2 && segments[0].length > 1) {
let scope = segments[0].substr(1);
const scope = segments[0].substr(1);
let name = segments[1];
if (name.length < 4) {
name = '';
}
let queryUrl = `https://registry.npmjs.com/-/v1/search?text=scope:${scope}%20${name}&size=250`;
const queryUrl = `https://registry.npmjs.com/-/v1/search?text=scope:${scope}%20${name}&size=250`;
return this.xhr({
url: queryUrl,
headers: { agent: USER_AGENT }
@@ -163,7 +163,7 @@ export class PackageJSONContribution implements IJSONContribution {
const obj = JSON.parse(success.responseText);
if (obj && Array.isArray(obj.objects)) {
const objects = <{ package: SearchPackageInfo }[]>obj.objects;
for (let object of objects) {
for (const object of objects) {
this.processPackage(object.package, addValue, isLast, collector);
}
}
@@ -286,7 +286,7 @@ export class PackageJSONContribution implements IJSONContribution {
private npmView(npmCommandPath: string, pack: string, resource: Uri | undefined): Promise<ViewPackageInfo | undefined> {
return new Promise((resolve, _reject) => {
const args = ['view', '--json', pack, 'description', 'dist-tags.latest', 'homepage', 'version'];
let cwd = resource && resource.scheme === 'file' ? dirname(resource.fsPath) : undefined;
const cwd = resource && resource.scheme === 'file' ? dirname(resource.fsPath) : undefined;
cp.execFile(npmCommandPath, args, { cwd }, (error, stdout) => {
if (!error) {
try {

12
extensions/npm/src/npmMain.ts
View File

@@ -93,17 +93,17 @@ function canRunNpmInCurrentWorkspace() {
let taskProvider: NpmTaskProvider;
function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposable | undefined {
if (vscode.workspace.workspaceFolders) {
let watcher = vscode.workspace.createFileSystemWatcher('**/package.json');
const watcher = vscode.workspace.createFileSystemWatcher('**/package.json');
watcher.onDidChange((_e) => invalidateScriptCaches());
watcher.onDidDelete((_e) => invalidateScriptCaches());
watcher.onDidCreate((_e) => invalidateScriptCaches());
context.subscriptions.push(watcher);
let workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches());
const workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches());
context.subscriptions.push(workspaceWatcher);
taskProvider = new NpmTaskProvider(context);
let disposable = vscode.tasks.registerTaskProvider('npm', taskProvider);
const disposable = vscode.tasks.registerTaskProvider('npm', taskProvider);
context.subscriptions.push(disposable);
return disposable;
}
@@ -112,7 +112,7 @@ function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposab
function registerExplorer(context: vscode.ExtensionContext): NpmScriptsTreeDataProvider | undefined {
if (vscode.workspace.workspaceFolders) {
let treeDataProvider = new NpmScriptsTreeDataProvider(context, taskProvider!);
const treeDataProvider = new NpmScriptsTreeDataProvider(context, taskProvider!);
const view = vscode.window.createTreeView('npm', { treeDataProvider: treeDataProvider, showCollapseAll: true });
context.subscriptions.push(view);
return treeDataProvider;
@@ -122,12 +122,12 @@ function registerExplorer(context: vscode.ExtensionContext): NpmScriptsTreeDataP
function registerHoverProvider(context: vscode.ExtensionContext): NpmScriptHoverProvider | undefined {
if (vscode.workspace.workspaceFolders) {
let npmSelector: vscode.DocumentSelector = {
const npmSelector: vscode.DocumentSelector = {
language: 'json',
scheme: 'file',
pattern: '**/package.json'
};
let provider = new NpmScriptHoverProvider(context);
const provider = new NpmScriptHoverProvider(context);
context.subscriptions.push(vscode.languages.registerHoverProvider(npmSelector, provider));
return provider;
}

20
extensions/npm/src/npmView.ts
View File

@@ -180,7 +180,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
if (!uri) {
return;
}
let task = await createTask(await getPackageManager(this.context, selection.folder.workspaceFolder.uri, true), 'install', ['install'], selection.folder.workspaceFolder, uri, undefined, []);
const task = await createTask(await getPackageManager(this.context, selection.folder.workspaceFolder.uri, true), 'install', ['install'], selection.folder.workspaceFolder, uri, undefined, []);
tasks.executeTask(task);
}
@@ -194,8 +194,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
if (!uri) {
return;
}
let document: TextDocument = await workspace.openTextDocument(uri);
let position = this.findScriptPosition(document, selection instanceof NpmScript ? selection : undefined) || new Position(0, 0);
const document: TextDocument = await workspace.openTextDocument(uri);
const position = this.findScriptPosition(document, selection instanceof NpmScript ? selection : undefined) || new Position(0, 0);
await window.showTextDocument(document, { preserveFocus: true, selection: new Selection(position, position) });
}
@@ -260,7 +260,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
}
private isInstallTask(task: Task): boolean {
let fullName = getTaskName('install', task.definition.path);
const fullName = getTaskName('install', task.definition.path);
return fullName === task.name;
}
@@ -285,8 +285,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
}
private buildTaskTree(tasks: ITaskWithLocation[]): TaskTree {
let folders: Map<String, Folder> = new Map();
let packages: Map<String, PackageJSON> = new Map();
const folders: Map<String, Folder> = new Map();
const packages: Map<String, PackageJSON> = new Map();
let folder = null;
let packageJson = null;
@@ -311,16 +311,16 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
folder = new Folder(each.task.scope);
folders.set(each.task.scope.name, folder);
}
let definition: INpmTaskDefinition = <INpmTaskDefinition>each.task.definition;
let relativePath = definition.path ? definition.path : '';
let fullPath = path.join(each.task.scope.name, relativePath);
const definition: INpmTaskDefinition = <INpmTaskDefinition>each.task.definition;
const relativePath = definition.path ? definition.path : '';
const fullPath = path.join(each.task.scope.name, relativePath);
packageJson = packages.get(fullPath);
if (!packageJson) {
packageJson = new PackageJSON(folder, relativePath);
folder.addPackage(packageJson);
packages.set(fullPath, packageJson);
}
let script = new NpmScript(this.extensionContext, packageJson, each);
const script = new NpmScript(this.extensionContext, packageJson, each);
packageJson.addScript(script);
}
});

20
extensions/npm/src/scriptHover.ts
View File

@@ -52,7 +52,7 @@ export class NpmScriptHoverProvider implements HoverProvider {
cachedScripts?.scripts.forEach(({ name, nameRange }) => {
if (nameRange.contains(position)) {
let contents: MarkdownString = new MarkdownString();
const contents: MarkdownString = new MarkdownString();
contents.isTrusted = true;
contents.appendMarkdown(this.createRunScriptMarkdown(name, document.uri));
contents.appendMarkdown(this.createDebugScriptMarkdown(name, document.uri));
@@ -63,7 +63,7 @@ export class NpmScriptHoverProvider implements HoverProvider {
}
private createRunScriptMarkdown(script: string, documentUri: Uri): string {
let args = {
const args = {
documentUri: documentUri,
script: script,
};
@@ -90,7 +90,7 @@ export class NpmScriptHoverProvider implements HoverProvider {
}
private createMarkdownLink(label: string, cmd: string, args: any, tooltip: string, separator?: string): string {
let encodedArgs = encodeURIComponent(JSON.stringify(args));
const encodedArgs = encodeURIComponent(JSON.stringify(args));
let prefix = '';
if (separator) {
prefix = ` ${separator} `;
@@ -99,19 +99,19 @@ export class NpmScriptHoverProvider implements HoverProvider {
}
public async runScriptFromHover(args: any) {
let script = args.script;
let documentUri = args.documentUri;
let folder = workspace.getWorkspaceFolder(documentUri);
const script = args.script;
const documentUri = args.documentUri;
const folder = workspace.getWorkspaceFolder(documentUri);
if (folder) {
let task = await createTask(await getPackageManager(this.context, folder.uri), script, ['run', script], folder, documentUri);
const task = await createTask(await getPackageManager(this.context, folder.uri), script, ['run', script], folder, documentUri);
await tasks.executeTask(task);
}
}
public debugScriptFromHover(args: { script: string; documentUri: Uri }) {
let script = args.script;
let documentUri = args.documentUri;
let folder = workspace.getWorkspaceFolder(documentUri);
const script = args.script;
const documentUri = args.documentUri;
const folder = workspace.getWorkspaceFolder(documentUri);
if (folder) {
startDebugging(this.context, script, dirname(documentUri.fsPath), folder);
}

70
extensions/npm/src/tasks.ts
View File

@@ -87,7 +87,7 @@ export function invalidateTasksCache() {
const buildNames: string[] = ['build', 'compile', 'watch'];
function isBuildTask(name: string): boolean {
for (let buildName of buildNames) {
for (const buildName of buildNames) {
if (name.indexOf(buildName) !== -1) {
return true;
}
@@ -97,7 +97,7 @@ function isBuildTask(name: string): boolean {
const testNames: string[] = ['test'];
function isTestTask(name: string): boolean {
for (let testName of testNames) {
for (const testName of testNames) {
if (name === testName) {
return true;
}
@@ -150,15 +150,15 @@ export async function getPackageManager(extensionContext: ExtensionContext, fold
}
export async function hasNpmScripts(): Promise<boolean> {
let folders = workspace.workspaceFolders;
const folders = workspace.workspaceFolders;
if (!folders) {
return false;
}
try {
for (const folder of folders) {
if (isAutoDetectionEnabled(folder)) {
let relativePattern = new RelativePattern(folder, '**/package.json');
let paths = await workspace.findFiles(relativePattern, '**/node_modules/**');
const relativePattern = new RelativePattern(folder, '**/package.json');
const paths = await workspace.findFiles(relativePattern, '**/node_modules/**');
if (paths.length > 0) {
return true;
}
@@ -172,22 +172,22 @@ export async function hasNpmScripts(): Promise<boolean> {
async function detectNpmScripts(context: ExtensionContext, showWarning: boolean): Promise<ITaskWithLocation[]> {
let emptyTasks: ITaskWithLocation[] = [];
let allTasks: ITaskWithLocation[] = [];
let visitedPackageJsonFiles: Set<string> = new Set();
const emptyTasks: ITaskWithLocation[] = [];
const allTasks: ITaskWithLocation[] = [];
const visitedPackageJsonFiles: Set<string> = new Set();
let folders = workspace.workspaceFolders;
const folders = workspace.workspaceFolders;
if (!folders) {
return emptyTasks;
}
try {
for (const folder of folders) {
if (isAutoDetectionEnabled(folder)) {
let relativePattern = new RelativePattern(folder, '**/package.json');
let paths = await workspace.findFiles(relativePattern, '**/{node_modules,.vscode-test}/**');
const relativePattern = new RelativePattern(folder, '**/package.json');
const paths = await workspace.findFiles(relativePattern, '**/{node_modules,.vscode-test}/**');
for (const path of paths) {
if (!isExcluded(folder, path) && !visitedPackageJsonFiles.has(path.fsPath)) {
let tasks = await provideNpmScriptsForFolder(context, path, showWarning);
const tasks = await provideNpmScriptsForFolder(context, path, showWarning);
visitedPackageJsonFiles.add(path.fsPath);
allTasks.push(...tasks);
}
@@ -203,16 +203,16 @@ async function detectNpmScripts(context: ExtensionContext, showWarning: boolean)
export async function detectNpmScriptsForFolder(context: ExtensionContext, folder: Uri): Promise<IFolderTaskItem[]> {
let folderTasks: IFolderTaskItem[] = [];
const folderTasks: IFolderTaskItem[] = [];
try {
let relativePattern = new RelativePattern(folder.fsPath, '**/package.json');
let paths = await workspace.findFiles(relativePattern, '**/node_modules/**');
const relativePattern = new RelativePattern(folder.fsPath, '**/package.json');
const paths = await workspace.findFiles(relativePattern, '**/node_modules/**');
let visitedPackageJsonFiles: Set<string> = new Set();
const visitedPackageJsonFiles: Set<string> = new Set();
for (const path of paths) {
if (!visitedPackageJsonFiles.has(path.fsPath)) {
let tasks = await provideNpmScriptsForFolder(context, path, true);
const tasks = await provideNpmScriptsForFolder(context, path, true);
visitedPackageJsonFiles.add(path.fsPath);
folderTasks.push(...tasks.map(t => ({ label: t.task.name, task: t.task })));
}
@@ -239,12 +239,12 @@ function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) {
return minimatch(path, pattern, { dot: true });
}
let exclude = workspace.getConfiguration('npm', folder.uri).get<string | string[]>('exclude');
let packageJsonFolder = path.dirname(packageJsonUri.fsPath);
const exclude = workspace.getConfiguration('npm', folder.uri).get<string | string[]>('exclude');
const packageJsonFolder = path.dirname(packageJsonUri.fsPath);
if (exclude) {
if (Array.isArray(exclude)) {
for (let pattern of exclude) {
for (const pattern of exclude) {
if (testForExclusionPattern(packageJsonFolder, pattern)) {
return true;
}
@@ -257,18 +257,18 @@ function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) {
}
function isDebugScript(script: string): boolean {
let match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/);
const match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/);
return match !== null;
}
async function provideNpmScriptsForFolder(context: ExtensionContext, packageJsonUri: Uri, showWarning: boolean): Promise<ITaskWithLocation[]> {
let emptyTasks: ITaskWithLocation[] = [];
const emptyTasks: ITaskWithLocation[] = [];
let folder = workspace.getWorkspaceFolder(packageJsonUri);
const folder = workspace.getWorkspaceFolder(packageJsonUri);
if (!folder) {
return emptyTasks;
}
let scripts = await getScripts(packageJsonUri);
const scripts = await getScripts(packageJsonUri);
if (!scripts) {
return emptyTasks;
}
@@ -318,17 +318,17 @@ export async function createTask(packageManager: string, script: INpmTaskDefinit
}
function getRelativePath(packageJsonUri: Uri): string {
let rootUri = folder.uri;
let absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length);
const rootUri = folder.uri;
const absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length);
return absolutePath.substring(rootUri.path.length + 1);
}
let relativePackageJson = getRelativePath(packageJsonUri);
const relativePackageJson = getRelativePath(packageJsonUri);
if (relativePackageJson.length && !kind.path) {
kind.path = relativePackageJson.substring(0, relativePackageJson.length - 1);
}
let taskName = getTaskName(kind.script, relativePackageJson);
let cwd = path.dirname(packageJsonUri.fsPath);
const taskName = getTaskName(kind.script, relativePackageJson);
const cwd = path.dirname(packageJsonUri.fsPath);
const task = new Task(kind, folder, taskName, 'npm', new ShellExecution(packageManager, getCommandLine(cmd), { cwd: cwd }), matcher);
task.detail = scriptValue;
@@ -368,13 +368,13 @@ export async function hasPackageJson(): Promise<boolean> {
}
async function hasRootPackageJson(): Promise<boolean> {
let folders = workspace.workspaceFolders;
const folders = workspace.workspaceFolders;
if (!folders) {
return false;
}
for (const folder of folders) {
if (folder.uri.scheme === 'file') {
let packageJson = path.join(folder.uri.fsPath, 'package.json');
const packageJson = path.join(folder.uri.fsPath, 'package.json');
if (await exists(packageJson)) {
return true;
}
@@ -392,8 +392,8 @@ async function exists(file: string): Promise<boolean> {
}
export async function runScript(context: ExtensionContext, script: string, document: TextDocument) {
let uri = document.uri;
let folder = workspace.getWorkspaceFolder(uri);
const uri = document.uri;
const folder = workspace.getWorkspaceFolder(uri);
if (folder) {
const task = await createTask(await getPackageManager(context, folder.uri), script, ['run', script], folder, uri);
tasks.executeTask(task);
@@ -432,7 +432,7 @@ export async function getScripts(packageJsonUri: Uri) {
return undefined;
}
let packageJson = packageJsonUri.fsPath;
const packageJson = packageJsonUri.fsPath;
if (!await exists(packageJson)) {
return undefined;
}
@@ -441,7 +441,7 @@ export async function getScripts(packageJsonUri: Uri) {
const document: TextDocument = await workspace.openTextDocument(packageJsonUri);
return readScripts(document);
} catch (e) {
let localizedParseError = localize('npm.parseError', 'Npm task detection: failed to parse the file {0}', packageJsonUri.fsPath);
const localizedParseError = localize('npm.parseError', 'Npm task detection: failed to parse the file {0}', packageJsonUri.fsPath);
throw new Error(localizedParseError);
}
}