diff --git a/src/__tests__/modules/workspace.test.ts b/src/__tests__/modules/workspace.test.ts index 72435a43b58..c3b4d37dddc 100644 --- a/src/__tests__/modules/workspace.test.ts +++ b/src/__tests__/modules/workspace.test.ts @@ -292,6 +292,7 @@ describe('workspace methods', () => { expect(workspace.match([{ scheme: 'file' }], doc.textDocument)).toBe(5) expect(workspace.match([{ scheme: 'term' }], doc.textDocument)).toBe(0) expect(workspace.match([{ language: 'xml' }, { scheme: 'file' }], doc.textDocument)).toBe(10) + expect(workspace.match([{ language: 'xml', scheme: 'file', pattern: '**/*.xml' }], doc.textDocument)).toBe(10) }) it('should handle will save event', async () => { diff --git a/src/core/funcs.ts b/src/core/funcs.ts index 20b374da926..49a30fb3ed6 100644 --- a/src/core/funcs.ts +++ b/src/core/funcs.ts @@ -140,7 +140,7 @@ export function score(selector: DocumentSelector | DocumentFilter | string, uri: let p = caseInsensitive ? pattern.toLowerCase() : pattern let f = caseInsensitive ? u.fsPath.toLowerCase() : u.fsPath if (p === f || minimatch(f, p, { dot: true })) { - ret = 5 + ret = Math.max(ret, 5) } else { return 0 }