Define xml state inspection methods for html/angular modes

Issue #266
codemirror · Sep 11, 2019 · 47fe841 · 47fe841
1 parent ca49b24
commit 47fe841
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/src/angulartemplate.js b/src/angulartemplate.js
@@ -1,7 +1,7 @@
 import * as CodeMirror from "codemirror"
 import "codemirror-grammar-mode"
 import * as grammar from "./angulartemplate.mode"
-import {predicates, indent} from "./html_util"
+import {predicates, indent, contextInfo} from "./html_util"
 
 class AngularTemplateMode extends CodeMirror.GrammarMode {
   constructor(conf, modeConf) {
@@ -19,5 +19,6 @@ proto.electricInput = /^\s*<\/.*?>/
 proto.blockCommentStart = "<!--"
 proto.blockCommentEnd = "-->"
 proto.fold = "xml"
+contextInfo(proto)
 
 CodeMirror.defineMode("google-angular-template", (conf, modeConf) => new AngularTemplateMode(conf, modeConf))
diff --git a/src/html.grammar b/src/html.grammar
@@ -16,13 +16,17 @@ context tag {
   openTag
   (asTag("/>") |
    &selfClosing asTag(">") |
-   asTag(">") element* (~"</" (&matchingTag asTag("</") spaceChar* tagName asTag(">"))?))
+   asTag(">") element* (~"</" (&matchingTag closeTag)?))
 }
 
 context openTag {
   asTag("<") !(spaceChar* "/") spaceChar* tagName spaceChar* attribute*
 }
 
+context closeTag {
+  asTag("</") spaceChar* tagName asTag(">")
+}
+
 asTag(value)="tag" { value }
 
 attribute {

diff --git a/src/html.js b/src/html.js
@@ -1,7 +1,7 @@
 import * as CodeMirror from "codemirror"
 import "codemirror-grammar-mode"
 import * as grammar from "./html.mode"
-import {predicates, indent} from "./html_util"
+import {predicates, indent, contextInfo} from "./html_util"
 
 class HTMLMode extends CodeMirror.GrammarMode {
   constructor(conf, modeConf) {
@@ -19,5 +19,6 @@ proto.electricInput = /^\s*<\/.*?>/
 proto.blockCommentStart = "<!--"
 proto.blockCommentEnd = "-->"
 proto.fold = "xml"
+contextInfo(proto)
 
 CodeMirror.defineMode("google-html", (conf, modeConf) => new HTMLMode(conf, modeConf))
diff --git a/src/html_util.js b/src/html_util.js
@@ -34,3 +34,22 @@ export function indent(state, textAfter, line, config) {
   }
   return 0
 }
+
+export function contextInfo(proto) {
+  proto.xmlCurrentTag = state => {
+    let cx = state.context
+    if (!cx || (cx.name != "openTag" || cx.name != "closeTag")) return null
+    let match = /<\/?\s*([\w\-\.]+)/.exec(cx.startLine.slice(cx.startPos))
+    return match ? {name: match[1], close: cx.name == "closeTag"} : null
+  }
+  proto.xmlCurrentContext = state => {
+    let context = []
+    for (let cx = state.context; cx; cx = cx.parent) {
+      if (cx.name == "tag") {
+        let match = /<\/?\s*([\w\-\.]+)/.exec(cx.startLine.slice(cx.startPos))
+        if (match) context.push(match[1])
+      }
+    }
+    return context.reverse()
+  }
+}