提交 16075cc2 编写于 作者: M Matt Bierner

Add insertSpaceAfterOpeningAndBeforeClosingEmptyBrackets formatting setting

Fixes #109190
上级 b72c840b
......@@ -332,6 +332,12 @@
"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces%",
"scope": "resource"
},
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": {
"type": "boolean",
"default": true,
"description": "%format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces%",
"scope": "resource"
},
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
"type": "boolean",
"default": false,
......@@ -450,6 +456,12 @@
"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces%",
"scope": "resource"
},
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": {
"type": "boolean",
"default": true,
"description": "%format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces%",
"scope": "resource"
},
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
"type": "boolean",
"default": false,
......
......@@ -25,6 +25,7 @@
"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Defines space handling after opening and before closing non-empty parenthesis.",
"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Defines space handling after opening and before closing non-empty brackets.",
"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Defines space handling after opening and before closing non-empty braces.",
"format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": "Defines space handling after opening and before closing empty braces.",
"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Defines space handling after opening and before closing template string braces.",
"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Defines space handling after opening and before closing JSX expression braces.",
"format.insertSpaceAfterTypeAssertion": "Defines space handling after type assertions in TypeScript.",
......
......@@ -18,6 +18,11 @@ namespace Experimental {
export interface UserPreferences extends Proto.UserPreferences {
readonly provideRefactorNotApplicableReason?: boolean;
}
// https://github.com/microsoft/TypeScript/issues/41208
export interface FormatCodeSettings extends Proto.FormatCodeSettings {
readonly insertSpaceAfterOpeningAndBeforeClosingEmptyBraces?: boolean;
}
}
interface FileConfiguration {
......@@ -136,7 +141,7 @@ export default class FileConfigurationManager extends Disposable {
private getFormatOptions(
document: vscode.TextDocument,
options: vscode.FormattingOptions
): Proto.FormatCodeSettings {
): Experimental.FormatCodeSettings {
const config = vscode.workspace.getConfiguration(
isTypeScriptDocument(document) ? 'typescript.format' : 'javascript.format',
document.uri);
......@@ -157,6 +162,7 @@ export default class FileConfigurationManager extends Disposable {
insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis'),
insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets'),
insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces'),
insertSpaceAfterOpeningAndBeforeClosingEmptyBraces: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingEmptyBraces'),
insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces'),
insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: config.get<boolean>('insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces'),
insertSpaceAfterTypeAssertion: config.get<boolean>('insertSpaceAfterTypeAssertion'),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册