volar-service-css 0.0.69 → 0.0.71

package/index.js

@@ -108,7 +108,7 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
             const stylesheets = new WeakMap();
             const fileSystemProvider = {
                 stat: async (uri) => await context.env.fs?.stat(vscode_uri_1.URI.parse(uri))
-                    ?? { type: css.FileType.Unknown, ctime: 0, mtime: 0, size: 0 },
+                    ?? { type: css.FileType.Unknown, ctime: 0, mtime: 0, size: -1 },
                 readDirectory: async (uri) => await context.env.fs?.readDirectory(vscode_uri_1.URI.parse(uri)) ?? [],
             };
             const documentContext = getDocumentContext(context);
@@ -223,17 +223,19 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
                         let prefixes = [];
                         let suffixes = [];
                         if (codeOptions?.initialIndentLevel) {
+                            const documentText = document.getText();
+                            const lastSuffix = endWithNewLine(documentText) ? '}' : '\n}';
                             for (let i = 0; i < codeOptions.initialIndentLevel; i++) {
                                 if (i === codeOptions.initialIndentLevel - 1) {
                                     prefixes.push('_', '{');
-                                    suffixes.unshift('}');
+                                    suffixes.unshift(lastSuffix);
                                 }
                                 else {
                                     prefixes.push('_', '{\n');
                                     suffixes.unshift('\n}');
                                 }
                             }
-                            formatDocument = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, prefixes.join('') + document.getText() + suffixes.join(''));
+                            formatDocument = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, prefixes.join('') + documentText + suffixes.join(''));
                             formatRange = {
                                 start: formatDocument.positionAt(0),
                                 end: formatDocument.positionAt(formatDocument.getText().length),
@@ -261,7 +263,8 @@ function create({ cssDocumentSelector = ['css'], scssDocumentSelector = ['scss']
                         }
                         return edits;
                         function ensureNewLines(newText) {
-                            const verifyDocument = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, '_ {' + newText + '}');
+                            const verifySuffix = endWithNewLine(newText) ? '}' : '\n}';
+                            const verifyDocument = vscode_languageserver_textdocument_1.TextDocument.create(document.uri, document.languageId, document.version, '_ {' + newText + verifySuffix);
                             const verifyEdits = cssLs.format(verifyDocument, undefined, formatOptions);
                             let verifyText = vscode_languageserver_textdocument_1.TextDocument.applyEdits(verifyDocument, verifyEdits);
                             verifyText = verifyText.trimStart().slice('_'.length);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-css",
-	"version": "0.0.69",
+	"version": "0.0.71",
 	"description": "Integrate vscode-css-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/css",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -39,5 +39,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "1e526251a7229ad3092d1757bccbabcc6e6412e8"
+	"gitHead": "ce25205adf873830449078ff54f705edc64778e9"
 }