From 2c5c9636a276ffd00d78d8d7f9bfb13fb7740f77 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 1 Apr 2022 18:07:52 +0200 Subject: [PATCH] update css, new formatting options --- package-lock.json | 14 +++++++------- package.json | 2 +- src/language/css/monaco.contribution.ts | 11 ++++++++++- website/playground/monaco.d.ts.txt | 8 +++++++- website/typedoc/monaco.d.ts | 8 +++++++- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e50533e..4fcd145e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "ts-node": "^10.6.0", "typedoc": "^0.22.11", "typescript": "4.5.5", - "vscode-css-languageservice": "5.3.0", + "vscode-css-languageservice": "5.4.1", "vscode-html-languageservice": "4.2.4", "vscode-json-languageservice": "4.2.1", "vscode-languageserver-textdocument": "^1.0.4", @@ -2488,9 +2488,9 @@ "dev": true }, "node_modules/vscode-css-languageservice": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.3.0.tgz", - "integrity": "sha512-ujWW855AoJlE4ETU17Gff7unlZZTHDA0w26itk9EQFMfJqi9lE6S67zOsMvcPmJf55MrnGQbojDYZRiDVaFjdA==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz", + "integrity": "sha512-W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==", "dev": true, "dependencies": { "vscode-languageserver-textdocument": "^1.0.4", @@ -4601,9 +4601,9 @@ "dev": true }, "vscode-css-languageservice": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.3.0.tgz", - "integrity": "sha512-ujWW855AoJlE4ETU17Gff7unlZZTHDA0w26itk9EQFMfJqi9lE6S67zOsMvcPmJf55MrnGQbojDYZRiDVaFjdA==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.4.1.tgz", + "integrity": "sha512-W7D3GKFXf97ReAaU4EZ2nxVO1kQhztbycJgc1b/Ipr0h8zYWr88BADmrXu02z+lsCS84D7Sr4hoUzDKeaFn2Kg==", "dev": true, "requires": { "vscode-languageserver-textdocument": "^1.0.4", diff --git a/package.json b/package.json index 901c0f39..94b980ac 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "ts-node": "^10.6.0", "typedoc": "^0.22.11", "typescript": "4.5.5", - "vscode-css-languageservice": "5.3.0", + "vscode-css-languageservice": "5.4.1", "vscode-html-languageservice": "4.2.4", "vscode-json-languageservice": "4.2.1", "vscode-languageserver-textdocument": "^1.0.4", diff --git a/src/language/css/monaco.contribution.ts b/src/language/css/monaco.contribution.ts index 746c2e52..6b1d4e38 100644 --- a/src/language/css/monaco.contribution.ts +++ b/src/language/css/monaco.contribution.ts @@ -13,6 +13,12 @@ export interface CSSFormatConfiguration { newlineBetweenRules?: boolean; /** ensure space around selector separators: '>', '+', '~' (e.g. "a>b" -> "a > b"): Default: false */ spaceAroundSelectorSeparator?: boolean; + /** put braces on the same line as rules (`collapse`), or put braces on own line, Allman / ANSI style (`expand`). Default `collapse` */ + braceStyle?: 'collapse' | 'expand'; + /** whether existing line breaks before elements should be preserved. Default: true */ + preserveNewLines?: boolean; + /** maximum number of line breaks to be preserved in one chunk. Default: unlimited */ + maxPreserveNewLines?: number; } export interface Options { @@ -208,7 +214,10 @@ const optionsDefault: Required = { format: { newlineBetweenSelectors: true, newlineBetweenRules: true, - spaceAroundSelectorSeparator: false + spaceAroundSelectorSeparator: false, + braceStyle: 'collapse', + maxPreserveNewLines: undefined, + preserveNewLines: true } }; diff --git a/website/playground/monaco.d.ts.txt b/website/playground/monaco.d.ts.txt index 9d395a03..42fa26cc 100644 --- a/website/playground/monaco.d.ts.txt +++ b/website/playground/monaco.d.ts.txt @@ -7164,6 +7164,12 @@ declare namespace monaco.languages.css { newlineBetweenRules?: boolean; /** ensure space around selector separators: '>', '+', '~' (e.g. "a>b" -> "a > b"): Default: false */ spaceAroundSelectorSeparator?: boolean; + /** put braces on the same line as rules (`collapse`), or put braces on own line, Allman / ANSI style (`expand`). Default `collapse` */ + braceStyle?: 'collapse' | 'expand'; + /** whether existing line breaks before elements should be preserved. Default: true */ + preserveNewLines?: boolean; + /** maximum number of line breaks to be preserved in one chunk. Default: unlimited */ + maxPreserveNewLines?: number; } export interface Options { readonly validate?: boolean; @@ -7370,7 +7376,7 @@ declare namespace monaco.languages.html { */ readonly format?: HTMLFormatConfiguration; /** - * Conde completion settings. + * Code completion settings. */ readonly suggest?: CompletionConfiguration; /** diff --git a/website/typedoc/monaco.d.ts b/website/typedoc/monaco.d.ts index 9d395a03..42fa26cc 100644 --- a/website/typedoc/monaco.d.ts +++ b/website/typedoc/monaco.d.ts @@ -7164,6 +7164,12 @@ declare namespace monaco.languages.css { newlineBetweenRules?: boolean; /** ensure space around selector separators: '>', '+', '~' (e.g. "a>b" -> "a > b"): Default: false */ spaceAroundSelectorSeparator?: boolean; + /** put braces on the same line as rules (`collapse`), or put braces on own line, Allman / ANSI style (`expand`). Default `collapse` */ + braceStyle?: 'collapse' | 'expand'; + /** whether existing line breaks before elements should be preserved. Default: true */ + preserveNewLines?: boolean; + /** maximum number of line breaks to be preserved in one chunk. Default: unlimited */ + maxPreserveNewLines?: number; } export interface Options { readonly validate?: boolean; @@ -7370,7 +7376,7 @@ declare namespace monaco.languages.html { */ readonly format?: HTMLFormatConfiguration; /** - * Conde completion settings. + * Code completion settings. */ readonly suggest?: CompletionConfiguration; /**