Highlight ns forms and their docstrings (#29)

Author: zampino

package.json

@@ -15,7 +15,7 @@
         "emoji-regex": "^10.0.0",
         "framer-motion": "^6.2.8",
         "katex": "^0.12.0",
-        "lezer-clojure": "1.0.0-rc.1",
+        "lezer-clojure": "1.0.0-rc.2",
         "markdown-it": "12.3.2",
         "markdown-it-block-image": "0.0.3",
         "markdown-it-sidenote": "gerwitz/markdown-it-sidenote#0b4ffb98ae6d013072f79a832785225c05dd1f29",

src/deps.cljs

@@ -10,5 +10,5 @@
   "@lezer/generator" "^1.0.0"
   "@lezer/highlight" "^1.0.0"
   "@lezer/lr" "^1.0.0"
-  "lezer-clojure" "1.0.0-rc.1"
+  "lezer-clojure" "1.0.0-rc.2"
   "w3c-keyname" "^2.2.4"}}

src/nextjournal/clojure_mode.cljs

@@ -20,9 +20,9 @@
       :Map coll-span
       :List coll-span})))
 
-
 (def style-tags
-  (clj->js {:DefLike (.-keyword tags)
+  (clj->js {:NS (.-keyword tags)
+            :DefLike (.-keyword tags)
             "Operator/Symbol" (.-keyword tags)
             "VarName/Symbol" (.definition tags (.-variableName tags))
             :Boolean (.-atom tags)

src/nextjournal/clojure_mode/clojure.grammar

@@ -14,6 +14,7 @@ Discard { "#_" expression }
 
 listContents {
    defList { defLikeWithMeta varNameWithMeta (DocString expression+ | expression+)? } |
+   nsList { nsWithMeta varNameWithMeta (DocString expression* | expression*) } |
    anyList { operatorWithMeta? expression* }
  }
 
@@ -55,6 +56,7 @@ Unquote[prefixColl] { "~" expression }
 UnquoteSplice[prefixColl] { "~@" expression }
 operatorWithMeta { Operator | Meta<operatorWithMeta> }
 defLikeWithMeta { DefLike | Meta<defLikeWithMeta> }
+nsWithMeta { NS | Meta<nsWithMeta> }
 varNameWithMeta { VarName | Meta<varNameWithMeta> }
 
 Operator { !operator Symbol }
@@ -135,5 +137,6 @@ Operator { !operator Symbol }
 Boolean { @specialize<Symbol, "true" | "false"> }
 Nil { @specialize<Symbol, "nil"> }
 DefLike[@dynamicPrecedence=1] { @extend<Symbol, "def" | "defn" | "defn-" | "defmacro" | "definline" | "defonce" | "deftest" | "defcard"> }
+NS[@dynamicPrecedence=2] { @extend<Symbol, "ns"> }
 
 @detectDelim

src/nextjournal/clojure_mode/extensions/formatting.cljs

@@ -30,10 +30,8 @@
             ;; if it's a list beginning with a symbol, add 1 space.
             (and (= "List" type-name)
                  (#{"Operator"
-                    "DefLike"} (some-> node
-                                       n/down
-                                       n/right
-                                       n/name)))
+                    "DefLike"
+                    "NS"} (some-> node n/down n/right n/name)))
             (+ 1))
           :else -1)))
 

src/nextjournal/clojure_mode/live_grammar.cljs

@@ -8,3 +8,9 @@
   (lg/buildParser
    (rc/inline "./clojure.grammar")
    #js{:externalProp n/node-prop}))
+
+(comment
+  (.parse parser "(def foo)")
+  (.parse parser "(ns foo)")
+  (.parse parser "(foo bar)")
+  )

yarn.lock

@@ -469,10 +469,10 @@ katex@^0.12.0:
   dependencies:
     commander "^2.19.0"
 
-[email protected].1:
-  version "1.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/lezer-clojure/-/lezer-clojure-1.0.0-rc.1.tgz#eef6f12bad228a10d668b3769be24a3b39b1f336"
-  integrity sha512-PhhygzeN7V134kHh9r14w+ZnZ+dfyE8HHiiMVc5y+V6d5/E8w62xKveE/C0zv1H3dbHOQoo3/rU+ytcNgEjRYw==
+[email protected].2:
+  version "1.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/lezer-clojure/-/lezer-clojure-1.0.0-rc.2.tgz#cec59eafdd150bec9a5524214bc201b4ee117575"
+  integrity sha512-IdEwD9cq/PSTD3TBYHosqQQu4sKiBCdAcqucGimR0BwKRMnaPAjSgnj/JJ3ykmCwHf1pRHdVyr23gVaxYx2Tvg==
   dependencies:
     "@lezer/lr" "^1.0.0"