Add a multi line tag snippet.

This takes priority over a single line tag. Also get continued indent to work in PGML blocks.
openwebwork · Nov 15, 2024 · 817796e · 817796e
1 parent 1e3095a
commit 817796e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@openwebwork/codemirror-lang-pg",
-    "version": "0.0.1-beta.10",
+    "version": "0.0.1-beta.11",
     "description": "PG language support for CodeMirror",
     "author": "The WeBWorK Project",
     "license": "MIT",

diff --git a/src/pgml-language-data.ts b/src/pgml-language-data.ts
@@ -10,6 +10,7 @@ import type { CompletionContext } from '@codemirror/autocomplete';
 import { snippetCompletion } from '@codemirror/autocomplete';
 
 export const pgmlIndent = {
+    PGMLContent: () => null,
     PerlCommand: delimitedIndent({ closing: '@]' }),
     Table: delimitedIndent({ closing: '#]' }),
     Tag: delimitedIndent({ closing: '>]' })
@@ -155,13 +156,22 @@ const imageSnippet = snippetCompletion('[!${alt text}!]{${$source}}${}', {
     boost: i--
 });
 
-const tagSnippet = snippetCompletion('[<${ }>]${}', {
-    label: '[< >]',
-    info: 'html tag',
-    type: 'type',
-    section: { name: 'substitution', rank: ++rank },
-    boost: i--
-});
+const tagSnippets = [
+    snippetCompletion('[<\n\t${ }\n>]${}', {
+        label: '[< >]',
+        info: 'html tag (multi line)',
+        type: 'type',
+        section: { name: 'substitution', rank: ++rank },
+        boost: i--
+    }),
+    snippetCompletion('[<${ }>]${}', {
+        label: '[< >]',
+        info: 'html tag (single line)',
+        type: 'type',
+        section: { name: 'substitution', rank },
+        boost: i--
+    })
+];
 
 const commentSnippet = snippetCompletion('[% ${ } %]${}', {
     label: '[% %]',
@@ -324,7 +334,7 @@ export const pgmlLanguageData = {
                         ...variableSnippets,
                         ...perlCommandSnippets,
                         imageSnippet,
-                        tagSnippet,
+                        ...tagSnippets,
                         commentSnippet,
                         ...tableSnippets,
                         ...verbatimSnippets
@@ -350,7 +360,7 @@ export const pgmlLanguageData = {
                     ...variableSnippets,
                     ...perlCommandSnippets,
                     imageSnippet,
-                    tagSnippet,
+                    ...tagSnippets,
                     commentSnippet,
                     ...tableSnippets,
                     ...verbatimSnippets,