@stylable/language-service
Advanced tools
Comparing version 4.9.2 to 4.9.3
@@ -295,3 +295,4 @@ "use strict"; | ||
comps.push(...Object.keys(meta.customSelectors).map((c) => (0, completion_types_1.classCompletion)(c, createDirectiveRange(position, fullLineText, lineChunkAtCursor), true))); | ||
const moreComps = meta.imports | ||
const moreComps = meta | ||
.getImportStatements() | ||
.filter((imp) => imp.request.endsWith('st.css')) | ||
@@ -333,3 +334,3 @@ .reduce((acc, imp) => { | ||
.map((s) => [s, 'Local file'])); | ||
meta.imports.forEach((i) => { | ||
meta.getImportStatements().forEach((i) => { | ||
if (i.defaultExport && | ||
@@ -341,3 +342,3 @@ i.defaultExport.startsWith(str) && | ||
}); | ||
meta.imports.forEach((i) => comps.push(...Object.keys(i.named) | ||
meta.getImportStatements().forEach((i) => comps.push(...Object.keys(i.named) | ||
.filter((s) => { | ||
@@ -393,3 +394,5 @@ const res = stylable.resolver.resolve(meta.getSymbol(s)); | ||
provide({ parentSelector, meta, fullLineText, lineChunkAtCursor, position, fs, tsLangService, stylable, }) { | ||
if (meta.imports.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
if (meta | ||
.getImportStatements() | ||
.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
!fullLineText.trim().startsWith(core_1.valueMapping.from) && | ||
@@ -422,3 +425,5 @@ parentSelector && | ||
provide({ meta, fullLineText, parentSelector, lineChunkAtCursor, position, fs, tsLangService, stylable, }) { | ||
if (meta.imports.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
if (meta | ||
.getImportStatements() | ||
.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
!fullLineText.trim().startsWith(core_1.valueMapping.from) && | ||
@@ -515,3 +520,3 @@ !fullLineText.trim().startsWith(core_1.valueMapping.extends) && | ||
try { | ||
const imported = meta.imports.find((i) => i.request === importName); | ||
const imported = meta.getImportStatements().find((i) => i.request === importName); | ||
resolvedImport = stylable.fileProcessor.process(stylable.resolvePath(imported.context, imported.request)); | ||
@@ -898,3 +903,3 @@ } | ||
const importVars = []; | ||
meta.imports.forEach((imp) => { | ||
meta.getImportStatements().forEach((imp) => { | ||
try { | ||
@@ -915,3 +920,5 @@ const resolvedPath = stylable.resolvePath((0, path_1.dirname)(meta.source), imp.request); | ||
if (v.name.startsWith(inner) && | ||
meta.imports.some((imp) => Object.keys(imp.named).some((key) => key === v.name))) { | ||
meta | ||
.getImportStatements() | ||
.some((imp) => Object.keys(imp.named).some((key) => key === v.name))) { | ||
const value = (0, core_1.evalDeclarationValue)(stylable.resolver, v.value, meta, v.node); | ||
@@ -918,0 +925,0 @@ comps.push((0, completion_types_1.valueCompletion)(v.name, v.from, value, new ProviderRange(new ProviderPosition(position.line, position.character - inner.length), position))); |
{ | ||
"name": "@stylable/language-service", | ||
"version": "4.9.2", | ||
"version": "4.9.3", | ||
"description": "Stylable Language Services - syntax highlighting, completions, hinting and more for the Stylable CSS preprocessor.", | ||
@@ -16,6 +16,6 @@ "main": "dist/index.js", | ||
"@file-services/typescript": "^5.4.3", | ||
"@stylable/code-formatter": "^4.9.2", | ||
"@stylable/core": "^4.9.2", | ||
"@stylable/code-formatter": "^4.9.3", | ||
"@stylable/core": "^4.9.3", | ||
"css-selector-tokenizer": "^0.8.0", | ||
"postcss": "^8.4.4", | ||
"postcss": "^8.4.5", | ||
"postcss-value-parser": "^4.2.0", | ||
@@ -22,0 +22,0 @@ "vscode-css-languageservice": "^5.1.9", |
@@ -485,3 +485,4 @@ import path, { dirname } from 'path'; | ||
); | ||
const moreComps = meta.imports | ||
const moreComps = meta | ||
.getImportStatements() | ||
.filter((imp) => imp.request.endsWith('st.css')) | ||
@@ -538,3 +539,3 @@ .reduce((acc: Completion[], imp) => { | ||
); | ||
meta.imports.forEach((i) => { | ||
meta.getImportStatements().forEach((i) => { | ||
if ( | ||
@@ -548,3 +549,3 @@ i.defaultExport && | ||
}); | ||
meta.imports.forEach((i) => | ||
meta.getImportStatements().forEach((i) => | ||
comps.push( | ||
@@ -637,5 +638,5 @@ ...Object.keys(i.named) | ||
if ( | ||
meta.imports.some( | ||
(imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js') | ||
) && | ||
meta | ||
.getImportStatements() | ||
.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
!fullLineText.trim().startsWith(valueMapping.from) && | ||
@@ -680,5 +681,5 @@ parentSelector && | ||
if ( | ||
meta.imports.some( | ||
(imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js') | ||
) && | ||
meta | ||
.getImportStatements() | ||
.some((imp) => imp.request.endsWith('.ts') || imp.request.endsWith('.js')) && | ||
!fullLineText.trim().startsWith(valueMapping.from) && | ||
@@ -845,3 +846,3 @@ !fullLineText.trim().startsWith(valueMapping.extends) && | ||
try { | ||
const imported = meta.imports.find((i) => i.request === importName)!; | ||
const imported = meta.getImportStatements().find((i) => i.request === importName)!; | ||
resolvedImport = stylable.fileProcessor.process( | ||
@@ -1505,3 +1506,3 @@ stylable.resolvePath(imported.context, imported.request) | ||
const importVars: any[] = []; | ||
meta.imports.forEach((imp) => { | ||
meta.getImportStatements().forEach((imp) => { | ||
try { | ||
@@ -1525,3 +1526,5 @@ const resolvedPath = stylable.resolvePath(dirname(meta.source), imp.request); | ||
v.name.startsWith(inner) && | ||
meta.imports.some((imp) => Object.keys(imp.named).some((key) => key === v.name)) | ||
meta | ||
.getImportStatements() | ||
.some((imp) => Object.keys(imp.named).some((key) => key === v.name)) | ||
) { | ||
@@ -1528,0 +1531,0 @@ const value = evalDeclarationValue(stylable.resolver, v.value, meta, v.node); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
546926
8863
Updated@stylable/core@^4.9.3
Updatedpostcss@^8.4.5