From 9fa2a2538c8baadeeae21952d5badcfc787268d5 Mon Sep 17 00:00:00 2001 From: rebornix Date: Wed, 28 Jun 2017 15:57:40 -0700 Subject: [PATCH] Fix #29725. Add indentation rules for CSS. --- extensions/css/client/src/cssMain.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index caab3531a49..33fc8f20062 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -61,16 +61,24 @@ export function activate(context: ExtensionContext) { context.subscriptions.push(disposable); }); + let indentationRules = { + increaseIndentPattern: /(^.*\{[^}]*$)/, + decreaseIndentPattern: /^\s*\}/ + }; + languages.setLanguageConfiguration('css', { - wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g + wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g, + indentationRules: indentationRules }); languages.setLanguageConfiguration('less', { - wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]+(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g + wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]+(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g, + indentationRules: indentationRules }); languages.setLanguageConfiguration('scss', { - wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@$#.!])?[\w-?]+%?|[@#!$.])/g + wordPattern: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@$#.!])?[\w-?]+%?|[@#!$.])/g, + indentationRules: indentationRules }); commands.registerCommand('_css.applyCodeAction', applyCodeAction);