Skip to content

Commit 818a1a5

Browse files
committed
fix: don't track emmet.excludeLanguages if emmet is not enabled
1 parent e6c5c9c commit 818a1a5

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/emmet.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ import { sendCommand } from './sendCommand'
55

66
export const registerEmmet = async () => {
77
if (process.env.PLATFORM !== 'web') {
8+
let isEmmetEnabled: boolean
9+
const setIsEmmetEnabled = () => {
10+
isEmmetEnabled = !!vscode.extensions.getExtension('vscode.emmet')
11+
}
12+
13+
setIsEmmetEnabled()
14+
vscode.extensions.onDidChange(setIsEmmetEnabled)
15+
816
const emmet = await import('@vscode/emmet-helper')
917
const reactLangs = ['javascriptreact', 'typescriptreact']
1018
vscode.languages.registerCompletionItemProvider(
@@ -13,7 +21,7 @@ export const registerEmmet = async () => {
1321
async provideCompletionItems(document, position, token, context) {
1422
if (!getExtensionSetting('jsxEmmet')) return
1523
const emmetConfig = vscode.workspace.getConfiguration('emmet')
16-
if (!emmetConfig.excludeLanguages.includes(document.languageId)) return
24+
if (isEmmetEnabled && !emmetConfig.excludeLanguages.includes(document.languageId)) return
1725

1826
const result = await sendCommand<EmmetResult>('emmet-completions', { document, position })
1927
if (!result) return

0 commit comments

Comments
 (0)