From 5704b37beec8927e6a22836d8b1b032382177a98 Mon Sep 17 00:00:00 2001 From: Heyward Fann Date: Mon, 29 May 2023 22:18:34 +0800 Subject: [PATCH] chore(exception): typo workspaceContains (#4545) --- src/__tests__/modules/extensionManager.test.ts | 8 ++++---- src/extension/manager.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/__tests__/modules/extensionManager.test.ts b/src/__tests__/modules/extensionManager.test.ts index 8ea7ff95af3..1a340e1cade 100644 --- a/src/__tests__/modules/extensionManager.test.ts +++ b/src/__tests__/modules/extensionManager.test.ts @@ -7,7 +7,7 @@ import { Disposable } from 'vscode-languageserver-protocol' import Watchman from '../../core/watchman' import { Extensions as ExtensionsInfo, getExtensionDefinitions, IExtensionRegistry } from '../../util/extensionRegistry' import events from '../../events' -import { API, checkCommand, checkFileSystem, checkLanguageId, Extension, ExtensionManager, ExtensionType, getActivationEvents, getEvents, getOnCommandList, toWorkspaceContinsPatterns } from '../../extension/manager' +import { API, checkCommand, checkFileSystem, checkLanguageId, Extension, ExtensionManager, ExtensionType, getActivationEvents, getEvents, getOnCommandList, toWorkspaceContainsPatterns } from '../../extension/manager' import { ExtensionJson, ExtensionStat } from '../../extension/stat' import { Registry } from '../../util/registry' import { disposeAll } from '../../util' @@ -77,10 +77,10 @@ describe('utils', () => { expect(checkFileSystem('file:///1', ['onFileSystem:x', 'onFileSystem:file'])).toBe(true) }) - it('should toWorkspaceContinsPatterns', async () => { - let res = toWorkspaceContinsPatterns(['workspaceContains:', 'workspaceContains:a.js', 'workspaceContains:b.js']) + it('should toWorkspaceContainsPatterns', async () => { + let res = toWorkspaceContainsPatterns(['workspaceContains:', 'workspaceContains:a.js', 'workspaceContains:b.js']) expect(res).toEqual(['a.js', 'b.js']) - res = toWorkspaceContinsPatterns(['workspaceContains:', 'workspaceContains:**/b.js']) + res = toWorkspaceContainsPatterns(['workspaceContains:', 'workspaceContains:**/b.js']) expect(res).toEqual(['**/b.js']) }) }) diff --git a/src/extension/manager.ts b/src/extension/manager.ts index afd8bc62bcc..d6fd2cbeb71 100644 --- a/src/extension/manager.ts +++ b/src/extension/manager.ts @@ -176,7 +176,7 @@ export class ExtensionManager { workspace.onDidChangeWorkspaceFolders(e => { if (e.added.length > 0) { this.tryActivateExtensions(ActivateEvents.WorkspaceContains, events => { - let patterns = toWorkspaceContinsPatterns(events) + let patterns = toWorkspaceContainsPatterns(events) return workspace.checkPatterns(patterns, e.added) }) } @@ -708,7 +708,7 @@ export function getActivationEvents(json: ExtensionJson): string[] { /** * Convert globl patterns */ -export function toWorkspaceContinsPatterns(activationEvents: string[]): string[] { +export function toWorkspaceContainsPatterns(activationEvents: string[]): string[] { let patterns: string[] = [] for (let eventName of activationEvents) { let parts = eventName.split(':')