updateEmmet
This commit is contained in:
Родитель
2fc6355a6c
Коммит
909914477a
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -21,8 +21,8 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"typescript-template-language-service-decorator": "^2.2.0",
|
||||
"vscode-css-languageservice": "^5.1.1",
|
||||
"vscode-emmet-helper": "1.2.11",
|
||||
"vscode-css-languageservice": "^5.1.4",
|
||||
"vscode-emmet-helper": "^2.6.4",
|
||||
"vscode-languageserver-types": "^3.16.0"
|
||||
},
|
||||
"files": [
|
||||
|
@ -31,7 +31,7 @@
|
|||
"devDependencies": {
|
||||
"@types/chai": "^4.1.4",
|
||||
"@types/mocha": "^5.2.4",
|
||||
"@types/node": "^7.0.22",
|
||||
"@types/node": "^16.4.2",
|
||||
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
||||
"@typescript-eslint/parser": "^4.22.0",
|
||||
"chai": "^4.1.2",
|
||||
|
@ -40,7 +40,7 @@
|
|||
"glob": "^7.1.2",
|
||||
"mocha": "^8.3.0",
|
||||
"prettier": "^2.2.1",
|
||||
"typescript": "^4.2.4"
|
||||
"typescript": "^4.3.5"
|
||||
},
|
||||
"scripts": {
|
||||
"compile": "tsc -p .",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
import { Logger, TemplateContext, TemplateLanguageService } from 'typescript-template-language-service-decorator';
|
||||
import * as ts from 'typescript/lib/tsserverlibrary';
|
||||
import { getCSSLanguageService, getSCSSLanguageService, LanguageService, FoldingRange } from 'vscode-css-languageservice';
|
||||
import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
|
||||
import { doComplete as emmetDoComplete } from 'vscode-emmet-helper';
|
||||
import * as vscode from 'vscode-languageserver-types';
|
||||
import * as config from './_config';
|
||||
import { ConfigurationManager } from './_configuration';
|
||||
|
@ -223,11 +223,8 @@ export class StyledTemplateLanguageService implements TemplateLanguageService {
|
|||
const doc = this.virtualDocumentFactory.createVirtualDocument(context);
|
||||
const virtualPosition = this.virtualDocumentFactory.toVirtualDocPosition(position);
|
||||
const stylesheet = this.scssLanguageService.parseStylesheet(doc);
|
||||
const emmetResults: vscode.CompletionList = {
|
||||
isIncomplete: true,
|
||||
items: [],
|
||||
};
|
||||
this.cssLanguageService.setCompletionParticipants([getEmmetCompletionParticipants(doc, virtualPosition, 'css', this.configurationManager.config.emmet, emmetResults)]);
|
||||
this.cssLanguageService.setCompletionParticipants([]);
|
||||
const emmetResults = emmetDoComplete(doc, virtualPosition, 'css', this.configurationManager.config.emmet) || emptyCompletionList;
|
||||
const completionsCss = this.cssLanguageService.doComplete(doc, virtualPosition, stylesheet) || emptyCompletionList;
|
||||
const completionsScss = this.scssLanguageService.doComplete(doc, virtualPosition, stylesheet) || emptyCompletionList;
|
||||
completionsScss.items = filterScssCompletionItems(completionsScss.items);
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
"rootDir": "src",
|
||||
"strict": true,
|
||||
"declaration": true,
|
||||
"sourceMap": true
|
||||
"sourceMap": true,
|
||||
"skipLibCheck": true
|
||||
},
|
||||
"exclude": ["lib", "e2e", "node_modules", "test-workspace"]
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче