(fix) register OnEnter rules (sveltejs#236)

b-fuze · Jun 28, 2020 · b4dbeff · b4dbeff
1 parent 22304be
commit b4dbeff
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/packages/svelte-vscode/src/extension.ts b/packages/svelte-vscode/src/extension.ts
@@ -10,6 +10,8 @@ import {
     Uri,
     ProgressLocation,
     ViewColumn,
+    languages,
+    IndentAction,
 } from 'vscode';
 import {
     LanguageClient,
@@ -23,6 +25,7 @@ import {
     TextDocumentEdit,
 } from 'vscode-languageclient';
 import { activateTagClosing } from './html/autoClose';
+import { EMPTY_ELEMENTS } from './html/htmlEmptyTagsShared';
 import CompiledCodeContentProvider from './CompiledCodeContentProvider';
 import * as path from 'path';
 
@@ -127,6 +130,25 @@ export function activate(context: ExtensionContext) {
     addRenameFileListener(getLS);
 
     addCompilePreviewCommand(getLS, context);
+
+    languages.setLanguageConfiguration('svelte', {
+        indentationRules: {
+            increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|link|meta|param)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/,
+            decreaseIndentPattern: /^\s*(<\/(?!html)[-_\.A-Za-z0-9]+\b[^>]*>|-->|\})/,
+        },
+        wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
+        onEnterRules: [
+            {
+                beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+                afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>/i,
+                action: { indentAction: IndentAction.IndentOutdent },
+            },
+            {
+                beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+                action: { indentAction: IndentAction.Indent },
+            },
+        ],
+    });
 }
 
 function addRenameFileListener(getLS: () => LanguageClient) {

diff --git a/packages/svelte-vscode/src/html/htmlEmptyTagsShared.ts b/packages/svelte-vscode/src/html/htmlEmptyTagsShared.ts
@@ -0,0 +1,26 @@
+// Original source: https://github.com/microsoft/vscode/blob/master/extensions/html-language-features/client/src/htmlEmptyTagsShared.ts
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const EMPTY_ELEMENTS: string[] = [
+    'area',
+    'base',
+    'br',
+    'col',
+    'embed',
+    'hr',
+    'img',
+    'input',
+    'keygen',
+    'link',
+    'menuitem',
+    'meta',
+    'param',
+    'source',
+    'track',
+    'wbr',
+];
+