@master/css-language-server 2.0.0-rc.74 → 2.0.0-rc.76

package/README.md

@@ -73,7 +73,9 @@ import CSSLanguageServer from '@master/css-language-server'
 const languageServer = new CSSLanguageServer(connection, customSettings)
 ```
 
-`CSSLanguageServer` wraps `@master/css-language-service` with LSP workspace lifecycle, completion, hover, document color, color presentation, and semantic token handlers.
+`CSSLanguageServer` wraps `@master/css-language-service` with LSP workspace lifecycle, completion, hover, document color, color presentation, semantic token, and directive formatting handlers.
+
+Diagnostics are intentionally limited to language-server-owned behavior: CSS directive diagnostics and project manifest loading diagnostics. Class syntax and policy rules such as sorting, canonical class preference, conflict detection, invalid classes, and raw-value approval are owned by `@master/eslint-plugin-css`.
 
 ## Semantic tokens
 
@@ -87,6 +89,12 @@ The language server supports full-document and active-position semantic tokens.
 
 CSS directive syntax is highlighted by the shared TextMate grammar. Server semantic tokens cover Master CSS class-list spans and directive class-list spans such as `@compose` and `@safelist`.
 
+## Formatting
+
+The server advertises `documentFormattingProvider` and `documentRangeFormattingProvider` when `formatDirectives` is enabled. Formatting returns directive-only edits for CSS, SCSS, and LESS documents, plus CSS-family `<style>` blocks in Vue, Svelte, and Astro documents.
+
+Directive formatting normalizes safe directive spacing and repairs class-list important markers such as `bg:transparent !` to `bg:transparent!`. It does not run the compiler and does not change generated CSS output.
+
 ## Settings
 
 ```js
@@ -97,6 +105,7 @@ import { settings } from '@master/css-language-server'
 | --- | --- | --- | --- |
 | `workspaces` | `FastGlobPattern[] \| 'auto'` | `'auto'` | Workspace roots where independent language services are created. The root workspace is always included. |
 | `verbose` | `boolean` | `false` | Print server logs. |
+| `formatDirectives` | `boolean` | `true` | Enables LSP document and range formatting for Master CSS directives. |
 | `embeddedSyntaxHighlighting` | `'active' \| 'always' \| 'off'` | `'active'` | Inherited language-service semantic token mode. |
 
-With `workspaces: 'auto'`, the server creates workspaces from CSS files containing `@master entry;` or `@import '@master/css'`, and from `package.json` files that declare Master CSS package dependencies.
+With `workspaces: 'auto'`, the server creates workspaces from CSS files importing `@master/css`, CSS files containing the lightweight `@master entry;` marker, and `package.json` files that declare Master CSS package dependencies.

package/dist/core.d.ts

@@ -1,6 +1,6 @@
-import { ClientCapabilities, ColorPresentationParams, CompletionParams, Connection, DidChangeConfigurationParams, DocumentColorParams, HoverParams, InitializeParams, InitializeResult, RemoteConsole, SemanticTokensParams, TextDocumentChangeEvent, TextDocumentPositionParams, TextDocuments, WorkspaceFolder } from "vscode-languageserver/node";
+import { ClientCapabilities, ColorPresentationParams, CompletionParams, Connection, DidChangeConfigurationParams, DocumentColorParams, DocumentFormattingParams, DocumentRangeFormattingParams, HoverParams, InitializeParams, InitializeResult, RemoteConsole, SemanticTokensParams, TextDocumentChangeEvent, TextDocumentPositionParams, TextDocuments, TextEdit, WorkspaceFolder } from "vscode-languageserver/node";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import CSSLanguageService, { Settings } from "@master/css-language-service";
+import CSSLanguageService from "@master/css-language-service";
 import { MasterCSSWorkspacePackageResolution } from "@master/css-project/workspace";
 import { CSSLanguageRuntime } from "@master/css-language";
 import { Settings as Settings$1 } from "./settings.js";
@@ -10,10 +10,11 @@ declare interface Workspace {
   uri: string;
   openedTextDocuments: TextDocument[];
   languageService?: CSSLanguageService;
-  languageServiceSettings: Settings;
+  languageServiceSettings: Settings$1;
   languageRuntime?: CSSLanguageRuntime;
   languageRuntimeResolution?: MasterCSSWorkspacePackageResolution;
   languageRuntimeSource?: 'workspace' | 'bundled';
+  manifestErrors?: unknown[];
   planEntries?: string[];
 }
 declare const ACTIVE_SEMANTIC_TOKENS_REQUEST = "masterCSS/renderActiveSemanticTokens";
@@ -38,6 +39,9 @@ declare class CSSLanguageServer {
   onCompletion(params: CompletionParams): Promise<import("vscode-languageserver-protocol").CompletionItem[] | undefined>;
   onDocumentColor(params: DocumentColorParams): Promise<import("vscode-languageserver-protocol").ColorInformation[]>;
   onColorPresentation(params: ColorPresentationParams): Promise<import("vscode-languageserver-protocol").ColorPresentation[]>;
+  private getWorkspaceDocument;
+  onDocumentFormatting(params: DocumentFormattingParams): Promise<TextEdit[]>;
+  onDocumentRangeFormatting(params: DocumentRangeFormattingParams): Promise<TextEdit[]>;
   onSemanticTokens(params: SemanticTokensParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
   onDocumentSemanticTokens(params: SemanticTokensParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
   onActiveSemanticTokens(params: TextDocumentPositionParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
@@ -55,7 +59,9 @@ declare class CSSLanguageServer {
   private importWorkspaceModule;
   destroyLanguageService(workspace: Workspace): void;
   findClosestWorkspace(textDocumentURI: string): Workspace;
-  private publishCSSDirectiveDiagnostics;
+  private publishDiagnostics;
+  private createCSSDirectiveDiagnostics;
+  private createManifestLoadingDiagnostics;
   private createCSSDirectiveDiagnostic;
   private createCSSDirectiveRelatedInformation;
   private createCSSDirectiveRange;

package/dist/core.js

@@ -35,6 +35,8 @@ const SERVER_CAPABILITIES = {
 	},
 	colorProvider: true,
 	hoverProvider: true,
+	documentFormattingProvider: true,
+	documentRangeFormattingProvider: true,
 	semanticTokensProvider: {
 		legend: SEMANTIC_TOKENS_LEGEND,
 		full: true
@@ -137,7 +139,7 @@ var CSSLanguageServer = class {
 		} });
 	}
 	start() {
-		this.disposables.push(this.documents.onDidSave(this.onDidSave.bind(this)), this.documents.onDidOpen(this.onDidOpen.bind(this)), this.documents.onDidChangeContent(this.onDidChangeContent.bind(this)), this.documents.onDidClose(this.onDidClose.bind(this)), this.documents.listen(this.connection), this.connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)), this.connection.onHover(this.onHover.bind(this)), this.connection.onCompletion(this.onCompletion.bind(this)), this.connection.onDocumentColor(this.onDocumentColor.bind(this)), this.connection.onColorPresentation(this.onColorPresentation.bind(this)), this.connection.languages.semanticTokens.on(this.onSemanticTokens.bind(this)), this.connection.onRequest(DOCUMENT_SEMANTIC_TOKENS_REQUEST, this.onDocumentSemanticTokens.bind(this)), this.connection.onRequest(ACTIVE_SEMANTIC_TOKENS_REQUEST, this.onActiveSemanticTokens.bind(this)), this.connection.onInitialize(this.onInitialize.bind(this)), this.connection.onInitialized(() => this.init()));
+		this.disposables.push(this.documents.onDidSave(this.onDidSave.bind(this)), this.documents.onDidOpen(this.onDidOpen.bind(this)), this.documents.onDidChangeContent(this.onDidChangeContent.bind(this)), this.documents.onDidClose(this.onDidClose.bind(this)), this.documents.listen(this.connection), this.connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)), this.connection.onHover(this.onHover.bind(this)), this.connection.onCompletion(this.onCompletion.bind(this)), this.connection.onDocumentColor(this.onDocumentColor.bind(this)), this.connection.onColorPresentation(this.onColorPresentation.bind(this)), this.connection.onDocumentFormatting(this.onDocumentFormatting.bind(this)), this.connection.onDocumentRangeFormatting(this.onDocumentRangeFormatting.bind(this)), this.connection.languages.semanticTokens.on(this.onSemanticTokens.bind(this)), this.connection.onRequest(DOCUMENT_SEMANTIC_TOKENS_REQUEST, this.onDocumentSemanticTokens.bind(this)), this.connection.onRequest(ACTIVE_SEMANTIC_TOKENS_REQUEST, this.onActiveSemanticTokens.bind(this)), this.connection.onInitialize(this.onInitialize.bind(this)), this.connection.onInitialized(() => this.init()));
 		this.connection.listen();
 	}
 	init() {
@@ -158,6 +160,10 @@ var CSSLanguageServer = class {
 		if (params.workspaceFolders?.length) this.workspaceFolders = params.workspaceFolders;
 		const capabilities = { ...SERVER_CAPABILITIES };
 		if (this.settings?.embeddedSyntaxHighlighting !== "always") delete capabilities.semanticTokensProvider;
+		if (!this.settings?.formatDirectives) {
+			delete capabilities.documentFormattingProvider;
+			delete capabilities.documentRangeFormattingProvider;
+		}
 		return { capabilities };
 	}
 	async onHover(params) {
@@ -194,13 +200,30 @@ var CSSLanguageServer = class {
 		}
 		return [];
 	}
+	getWorkspaceDocument(uri) {
+		const workspace = this.findClosestWorkspace(uri);
+		if (!workspace?.languageService) return;
+		const document = this.documents.get(uri) ?? workspace.openedTextDocuments.find((document) => document.uri === uri);
+		if (!document) return;
+		return {
+			workspace,
+			document
+		};
+	}
+	async onDocumentFormatting(params) {
+		await this.init();
+		const context = this.getWorkspaceDocument(params.textDocument.uri);
+		return context?.workspace.languageService?.formatDirectives(context.document) ?? [];
+	}
+	async onDocumentRangeFormatting(params) {
+		await this.init();
+		const context = this.getWorkspaceDocument(params.textDocument.uri);
+		return context?.workspace.languageService?.formatDirectives(context.document, params.range) ?? [];
+	}
 	async onSemanticTokens(params) {
 		await this.init();
-		const workspace = this.findClosestWorkspace(params.textDocument.uri);
-		if (workspace?.languageService) {
-			const document = this.documents.get(params.textDocument.uri) ?? workspace.openedTextDocuments.find((document) => document.uri === params.textDocument.uri);
-			if (document) return workspace.languageService.renderSemanticTokens(document) ?? { data: [] };
-		}
+		const context = this.getWorkspaceDocument(params.textDocument.uri);
+		if (context) return context.workspace.languageService?.renderSemanticTokens(context.document) ?? { data: [] };
 		return { data: [] };
 	}
 	async onDocumentSemanticTokens(params) {
@@ -208,11 +231,8 @@ var CSSLanguageServer = class {
 	}
 	async onActiveSemanticTokens(params) {
 		await this.init();
-		const workspace = this.findClosestWorkspace(params.textDocument.uri);
-		if (workspace?.languageService) {
-			const document = this.documents.get(params.textDocument.uri) ?? workspace.openedTextDocuments.find((document) => document.uri === params.textDocument.uri);
-			if (document) return workspace.languageService.renderSemanticTokensAtPosition(document, params.position) ?? { data: [] };
-		}
+		const context = this.getWorkspaceDocument(params.textDocument.uri);
+		if (context) return context.workspace.languageService?.renderSemanticTokensAtPosition(context.document, params.position) ?? { data: [] };
 		return { data: [] };
 	}
 	async onDidOpen(params) {
@@ -220,18 +240,18 @@ var CSSLanguageServer = class {
 		const workspace = this.findClosestWorkspace(params.document.uri);
 		if (!workspace) return;
 		if (workspace.openedTextDocuments.includes(params.document)) {
-			this.publishCSSDirectiveDiagnostics(params.document, workspace);
+			this.publishDiagnostics(params.document, workspace);
 			return;
 		}
 		if (!workspace.openedTextDocuments.length) await this.initWorkspaceLanguageService(workspace);
 		workspace.openedTextDocuments.push(params.document);
-		this.publishCSSDirectiveDiagnostics(params.document, workspace);
+		this.publishDiagnostics(params.document, workspace);
 	}
 	async onDidChangeContent(params) {
 		await this.init();
 		const workspace = this.findClosestWorkspace(params.document.uri);
 		if (!workspace) return;
-		this.publishCSSDirectiveDiagnostics(params.document, workspace);
+		this.publishDiagnostics(params.document, workspace);
 	}
 	async onDidClose(params) {
 		await this.init();
@@ -248,7 +268,7 @@ var CSSLanguageServer = class {
 		await this.init();
 		const workspace = this.findClosestWorkspace(params.document.uri);
 		if (!workspace) return;
-		this.publishCSSDirectiveDiagnostics(params.document, workspace);
+		this.publishDiagnostics(params.document, workspace);
 		if (path.basename(URI.parse(params.document.uri).fsPath).endsWith(".css")) {
 			this.refreshSemanticTokens();
 			this.connection.sendRequest("masterCSS/restart", { title: "Updating Master CSS configuration" });
@@ -263,7 +283,7 @@ var CSSLanguageServer = class {
 			this.globalWorkspace.languageServiceSettings = this.settings;
 			this.refreshSemanticTokens();
 			this.connection.sendRequest("masterCSS/restart", { title: "Updating Master CSS settings" });
-			for (const workspace of [this.globalWorkspace, ...this.workspaces.values()]) for (const document of workspace.openedTextDocuments) this.publishCSSDirectiveDiagnostics(document, workspace);
+			for (const workspace of [this.globalWorkspace, ...this.workspaces.values()]) for (const document of workspace.openedTextDocuments) this.publishDiagnostics(document, workspace);
 		}
 	}
 	async initWorkspaceFolder(workspaceFolderURI) {
@@ -298,10 +318,12 @@ var CSSLanguageServer = class {
 	async initWorkspaceLanguageService(workspace) {
 		workspace.languageRuntime = await this.loadWorkspaceLanguageRuntime(workspace);
 		let workspacePlan;
+		workspace.manifestErrors = [];
 		if (workspace !== this.globalWorkspace) {
 			try {
 				workspacePlan = await this.loadWorkspacePlan(workspace);
 			} catch (e) {
+				workspace.manifestErrors = [e];
 				this.console.info(`Failed to load manifest from ${workspace.uri}`);
 				this.console.error(e instanceof Error ? e.stack : e.toString());
 			}
@@ -396,8 +418,17 @@ var CSSLanguageServer = class {
 		this.console.info(`This is an external document ${textDocumentURI} with the global workspace`);
 		return this.globalWorkspace;
 	}
-	publishCSSDirectiveDiagnostics(textDocument, workspace) {
-		if (!isCSSDiagnosticDocument(textDocument)) return;
+	publishDiagnostics(textDocument, workspace) {
+		const diagnostics = [];
+		diagnostics.push(...this.createManifestLoadingDiagnostics(textDocument, workspace));
+		diagnostics.push(...this.createCSSDirectiveDiagnostics(textDocument, workspace));
+		this.connection.sendDiagnostics({
+			uri: textDocument.uri,
+			diagnostics
+		});
+	}
+	createCSSDirectiveDiagnostics(textDocument, workspace) {
+		if (!isCSSDiagnosticDocument(textDocument)) return [];
 		const diagnostics = [];
 		const documentFile = path.resolve(URI.parse(textDocument.uri).fsPath);
 		for (const { source, offset } of getCSSDiagnosticSources(textDocument)) try {
@@ -410,9 +441,31 @@ var CSSLanguageServer = class {
 			const diagnostic = this.createCSSDirectiveDiagnostic(error, textDocument, documentFile, offset);
 			if (diagnostic) diagnostics.push(diagnostic);
 		}
-		this.connection.sendDiagnostics({
-			uri: textDocument.uri,
-			diagnostics
+		return diagnostics;
+	}
+	createManifestLoadingDiagnostics(textDocument, workspace) {
+		if (!workspace.manifestErrors?.length) return [];
+		const documentFile = path.resolve(URI.parse(textDocument.uri).fsPath);
+		return workspace.manifestErrors.map((error) => {
+			const directiveError = isCSSDirectiveError(error) ? error : void 0;
+			const source = directiveError?.source;
+			return {
+				range: source && (!source.file || path.resolve(source.file) === documentFile) ? this.createCSSDirectiveRange(source, textDocument, documentFile, 0) : {
+					start: {
+						line: 0,
+						character: 0
+					},
+					end: {
+						line: 0,
+						character: 0
+					}
+				},
+				severity: DiagnosticSeverity.Error,
+				code: "manifest-loading-error",
+				source: "Master CSS",
+				message: `Failed to load Master CSS manifest: ${error instanceof Error ? error.message : String(error)}`,
+				relatedInformation: directiveError ? this.createCSSDirectiveRelatedInformation(directiveError.related, textDocument, documentFile, 0) : void 0
+			};
 		});
 	}
 	createCSSDirectiveDiagnostic(error, textDocument, documentFile, sourceOffset) {

package/package.json

@@ -17,12 +17,12 @@
     "vscode-languageserver": "^10.0.0",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@master/css": "^2.0.0-rc.74",
-    "@master/css-compiler": "^2.0.0-rc.74",
-    "@master/css-language": "^2.0.0-rc.74",
-    "@master/css-project": "^2.0.0-rc.74",
-    "@master/css-language-service": "^2.0.0-rc.74",
-    "@master/css-schema": "^2.0.0-rc.74"
+    "@master/css-language": "^2.0.0-rc.76",
+    "@master/css": "^2.0.0-rc.76",
+    "@master/css-compiler": "^2.0.0-rc.76",
+    "@master/css-project": "^2.0.0-rc.76",
+    "@master/css-language-service": "^2.0.0-rc.76",
+    "@master/css-schema": "^2.0.0-rc.76"
   },
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "2.0.0-rc.74",
+  "version": "2.0.0-rc.76",
   "scripts": {
     "build": "tsdown --config ../../shared/tsdown-package.config.ts",
     "dev": "tsdown --config ../../shared/tsdown-package.config.ts --watch",