vscode-html-languageservice
Advanced tools
Comparing version 3.1.4 to 3.1.5
@@ -29,3 +29,3 @@ # Custom Data for HTML Language Service | ||
You should suffix your custom data file with `.html-data.json`, so VS Code will load the most recent schema for the JSON file to offer auto completion and error checking. | ||
When working with VSCode, you should suffix your custom data file with `.html-data.json`, so VS Code will load the most recent schema for the JSON file. | ||
@@ -32,0 +32,0 @@ [html5.ts](../src/languageFacts/data/html5.ts) contains that built-in dataset that conforms to the spec. |
// copied from js-beautify/js/lib/beautify-css.js | ||
// version: 1.11.0 | ||
// version: 1.13.0 | ||
/* AUTO-GENERATED. DO NOT MODIFY. */ | ||
@@ -1406,5 +1406,2 @@ /* | ||
} | ||
this.indent(); | ||
this._output.space_before_token = true; | ||
this.print_string(this._ch); | ||
@@ -1414,6 +1411,6 @@ // when entering conditional groups, only rulesets are allowed | ||
enteringConditionalGroup = false; | ||
insideRule = (this._indentLevel > this._nestedLevel); | ||
insideRule = (this._indentLevel >= this._nestedLevel); | ||
} else { | ||
// otherwise, declarations are also allowed | ||
insideRule = (this._indentLevel >= this._nestedLevel); | ||
insideRule = (this._indentLevel >= this._nestedLevel - 1); | ||
} | ||
@@ -1425,2 +1422,16 @@ if (this._options.newline_between_rules && insideRule) { | ||
} | ||
this._output.space_before_token = true; | ||
// The difference in print_string and indent order is necessary to indent the '{' correctly | ||
if (this._options.brace_style === 'expand') { | ||
this._output.add_new_line(); | ||
this.print_string(this._ch); | ||
this.indent(); | ||
this._output.set_indent(this._indentLevel); | ||
} else { | ||
this.indent(); | ||
this.print_string(this._ch); | ||
} | ||
this.eatWhitespace(true); | ||
@@ -1633,2 +1644,12 @@ this._output.add_new_line(); | ||
var brace_style_split = this._get_selection_list('brace_style', ['collapse', 'expand', 'end-expand', 'none', 'preserve-inline']); | ||
this.brace_style = 'collapse'; | ||
for (var bs = 0; bs < brace_style_split.length; bs++) { | ||
if (brace_style_split[bs] !== 'expand') { | ||
// default to collapse, as only collapse|expand is implemented for now | ||
this.brace_style = 'collapse'; | ||
} else { | ||
this.brace_style = brace_style_split[bs]; | ||
} | ||
} | ||
} | ||
@@ -1635,0 +1656,0 @@ Options.prototype = new BaseOptions(); |
@@ -20,2 +20,5 @@ import { Position, Range, MarkupContent, MarkupKind, DocumentUri } from 'vscode-languageserver-types'; | ||
extraLiners?: string; | ||
indentScripts?: 'keep' | 'separate' | 'normal'; | ||
templating?: boolean; | ||
unformattedContentDelimiter?: string; | ||
} | ||
@@ -22,0 +25,0 @@ export interface CompletionConfiguration { |
@@ -75,3 +75,6 @@ /*--------------------------------------------------------------------------------------------- | ||
wrap_attributes_indent_size: getFormatOption(options, 'wrapAttributesIndentSize', void 0), | ||
eol: '\n' | ||
eol: '\n', | ||
indent_scripts: getFormatOption(options, 'indentScripts', 'normal'), | ||
templating: getTemplatingFormatOption(options, 'all'), | ||
unformatted_content_delimiter: getFormatOption(options, 'unformattedContentDelimiter', ''), | ||
}; | ||
@@ -113,2 +116,9 @@ var result = html_beautify(trimLeft(value), htmlOptions); | ||
} | ||
function getTemplatingFormatOption(options, dflt) { | ||
var value = getFormatOption(options, 'templating', dflt); | ||
if (value === true) { | ||
return ['auto']; | ||
} | ||
return ['none']; | ||
} | ||
function computeIndentLevel(content, offset, options) { | ||
@@ -115,0 +125,0 @@ var i = offset; |
// copied from js-beautify/js/lib/beautify-css.js | ||
// version: 1.11.0 | ||
// version: 1.13.0 | ||
/* AUTO-GENERATED. DO NOT MODIFY. */ | ||
@@ -1409,5 +1409,2 @@ /* | ||
} | ||
this.indent(); | ||
this._output.space_before_token = true; | ||
this.print_string(this._ch); | ||
@@ -1417,6 +1414,6 @@ // when entering conditional groups, only rulesets are allowed | ||
enteringConditionalGroup = false; | ||
insideRule = (this._indentLevel > this._nestedLevel); | ||
insideRule = (this._indentLevel >= this._nestedLevel); | ||
} else { | ||
// otherwise, declarations are also allowed | ||
insideRule = (this._indentLevel >= this._nestedLevel); | ||
insideRule = (this._indentLevel >= this._nestedLevel - 1); | ||
} | ||
@@ -1428,2 +1425,16 @@ if (this._options.newline_between_rules && insideRule) { | ||
} | ||
this._output.space_before_token = true; | ||
// The difference in print_string and indent order is necessary to indent the '{' correctly | ||
if (this._options.brace_style === 'expand') { | ||
this._output.add_new_line(); | ||
this.print_string(this._ch); | ||
this.indent(); | ||
this._output.set_indent(this._indentLevel); | ||
} else { | ||
this.indent(); | ||
this.print_string(this._ch); | ||
} | ||
this.eatWhitespace(true); | ||
@@ -1636,2 +1647,12 @@ this._output.add_new_line(); | ||
var brace_style_split = this._get_selection_list('brace_style', ['collapse', 'expand', 'end-expand', 'none', 'preserve-inline']); | ||
this.brace_style = 'collapse'; | ||
for (var bs = 0; bs < brace_style_split.length; bs++) { | ||
if (brace_style_split[bs] !== 'expand') { | ||
// default to collapse, as only collapse|expand is implemented for now | ||
this.brace_style = 'collapse'; | ||
} else { | ||
this.brace_style = brace_style_split[bs]; | ||
} | ||
} | ||
} | ||
@@ -1638,0 +1659,0 @@ Options.prototype = new BaseOptions(); |
@@ -20,2 +20,5 @@ import { Position, Range, MarkupContent, MarkupKind, DocumentUri } from 'vscode-languageserver-types'; | ||
extraLiners?: string; | ||
indentScripts?: 'keep' | 'separate' | 'normal'; | ||
templating?: boolean; | ||
unformattedContentDelimiter?: string; | ||
} | ||
@@ -22,0 +25,0 @@ export interface CompletionConfiguration { |
@@ -87,3 +87,6 @@ /*--------------------------------------------------------------------------------------------- | ||
wrap_attributes_indent_size: getFormatOption(options, 'wrapAttributesIndentSize', void 0), | ||
eol: '\n' | ||
eol: '\n', | ||
indent_scripts: getFormatOption(options, 'indentScripts', 'normal'), | ||
templating: getTemplatingFormatOption(options, 'all'), | ||
unformatted_content_delimiter: getFormatOption(options, 'unformattedContentDelimiter', ''), | ||
}; | ||
@@ -126,2 +129,9 @@ var result = beautify_html_1.html_beautify(trimLeft(value), htmlOptions); | ||
} | ||
function getTemplatingFormatOption(options, dflt) { | ||
var value = getFormatOption(options, 'templating', dflt); | ||
if (value === true) { | ||
return ['auto']; | ||
} | ||
return ['none']; | ||
} | ||
function computeIndentLevel(content, offset, options) { | ||
@@ -128,0 +138,0 @@ var i = offset; |
{ | ||
"name": "vscode-html-languageservice", | ||
"version": "3.1.4", | ||
"version": "3.1.5", | ||
"description": "Language service for HTML", | ||
@@ -18,9 +18,9 @@ "main": "./lib/umd/htmlLanguageService.js", | ||
"devDependencies": { | ||
"@types/mocha": "^8.0.3", | ||
"@types/mocha": "^8.0.4", | ||
"@types/node": "^10.12.21", | ||
"@typescript-eslint/eslint-plugin": "^4.1.1", | ||
"@typescript-eslint/parser": "^4.1.1", | ||
"eslint": "^7.9.0", | ||
"@typescript-eslint/eslint-plugin": "^4.7.0", | ||
"@typescript-eslint/parser": "^4.7.0", | ||
"eslint": "^7.13.0", | ||
"js-beautify": "^1.13.0", | ||
"mocha": "^8.1.3", | ||
"mocha": "^8.2.1", | ||
"rimraf": "^3.0.2", | ||
@@ -27,0 +27,0 @@ "typescript": "^4.0.2", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1548424
32589