Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(extensions): typo workspaceContains #4545

Merged
merged 1 commit into from
May 29, 2023
Merged

chore(extensions): typo workspaceContains #4545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/__tests__/modules/extensionManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'])
})
})
Expand Down
4 changes: 2 additions & 2 deletions src/extension/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
}
Expand Down Expand Up @@ -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(':')
Expand Down