cm6: rename to nextjournal/clojure-mode

mk · mhuebert · nextjournal-ci · commit 1056e508c94c · 2020-12-23T08:36:58.000Z
* rename nextjournal/clojure-mode
* Rename more occurrances and update lazo config
* Update title

Co-authored-by: Matthew Huebert &lt;mhuebert@gmail.com&gt;
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# codemirror-clojure
+# clojure-mode for CodeMirror 6
 
-Live demo: https://nextjournal.github.io/codemirror.next-clojure/
+Live demo: https://nextjournal.github.io/clojure-mode/
 
 ## Dev Setup
 
@@ -28,4 +28,4 @@ Live demo: https://nextjournal.github.io/codemirror.next-clojure/
 - [x] odd error recovery behaviour - a `#` token can't be deleted
 - [x] deletion
 - [x] Copy/paste (only first line copies to clipboard?)
-- [x] Ctrl-A => move to beginning of line (first non-whitespace char)
+- [x] Ctrl-A => move to beginning of line (first non-whitespace char)
diff --git a/public/index.html b/public/index.html
@@ -22,7 +22,7 @@ <h1>Clojure/Script mode for <a href="https://codemirror.net/6/">CodeMirror 6</a>
             Built by <a href="https://nextjournal.com">Nextjournal</a>.
           </p>
           <div class="ctas">
-            <a href="https://github.com/nextjournal/codemirror.next-clojure" class="cta">
+            <a href="https://github.com/nextjournal/clojure-mode" class="cta">
               🐙 Clone on GitHub
             </a>
             <a href="https://nextjournal.com/try/clojure?cm6=1" class="cta">
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -6,7 +6,7 @@
                  :target :browser
                  :output-dir "public/js"
                  :asset-path "js"
-                 :modules {:main {:init-fn codemirror-next.clojure.demo/render}}}
+                 :modules {:main {:init-fn nextjournal.clojure-mode.demo/render}}}
           :test {:compiler-options {:output-feature-set :es8}
                  :target :browser-test
                  :test-dir "public/test"
diff --git a/src/demo/nextjournal/clojure_mode/demo.cljs b/src/demo/nextjournal/clojure_mode/demo.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure.demo
+(ns nextjournal.clojure-mode.demo
   (:require ["@codemirror/next/closebrackets" :refer [closeBrackets]]
             ["@codemirror/next/fold" :as fold]
             ["@codemirror/next/gutter" :refer [lineNumbers]]
@@ -11,16 +11,16 @@
             ["lezer-tree" :as lz-tree]
             [applied-science.js-interop :as j]
             [clojure.string :as str]
-            [codemirror-next.clojure :as cm-clj]
-            [codemirror-next.clojure.demo.sci :as sci]
-            [codemirror-next.clojure.extensions.close-brackets :as close-brackets]
-            [codemirror-next.clojure.extensions.formatting :as format]
-            [codemirror-next.clojure.extensions.selection-history :as sel-history]
-            [codemirror-next.clojure.keymap :as keymap]
-            [codemirror-next.clojure.live-grammar :as live-grammar]
-            [codemirror-next.clojure.node :as n]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.test-utils :as test-utils]
+            [nextjournal.clojure-mode :as cm-clj]
+            [nextjournal.clojure-mode.demo.sci :as sci]
+            [nextjournal.clojure-mode.extensions.close-brackets :as close-brackets]
+            [nextjournal.clojure-mode.extensions.formatting :as format]
+            [nextjournal.clojure-mode.extensions.selection-history :as sel-history]
+            [nextjournal.clojure-mode.keymap :as keymap]
+            [nextjournal.clojure-mode.live-grammar :as live-grammar]
+            [nextjournal.clojure-mode.node :as n]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.test-utils :as test-utils]
             [reagent.core :as r]
             [reagent.dom :as rdom]
             [shadow.resource :as rc]))
diff --git a/src/demo/nextjournal/clojure_mode/demo/sci.cljs b/src/demo/nextjournal/clojure_mode/demo/sci.cljs
@@ -1,10 +1,10 @@
-(ns codemirror-next.clojure.demo.sci
+(ns nextjournal.clojure-mode.demo.sci
   (:require ["@codemirror/next/view" :as view]
             [applied-science.js-interop :as j]
             [sci.core :as sci]
-            [codemirror-next.clojure.node :as n]
-            [codemirror-next.clojure.extensions.eval-region :as eval-region]
-            [codemirror-next.clojure.util :as u]))
+            [nextjournal.clojure-mode.node :as n]
+            [nextjournal.clojure-mode.extensions.eval-region :as eval-region]
+            [nextjournal.clojure-mode.util :as u]))
 
 (defonce context (sci/init {}))
 
diff --git a/src/main/nextjournal/clojure_mode.cljs b/src/main/nextjournal/clojure_mode.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure
+(ns nextjournal.clojure-mode
   (:require ["@codemirror/next/highlight" :as highlight :refer [tags]]
             ["@codemirror/next/state" :refer [EditorState]]
             ["@codemirror/next/language" :as language]
@@ -8,17 +8,17 @@
             ["lezer-tree" :as lz-tree]
             [applied-science.js-interop :as j]
             [clojure.string :as str]
-            [codemirror-next.clojure.extensions.close-brackets :as close-brackets]
-            [codemirror-next.clojure.extensions.match-brackets :as match-brackets]
-            [codemirror-next.clojure.extensions.formatting :as format]
-            [codemirror-next.clojure.extensions.selection-history :as sel-history]
-            [codemirror-next.clojure.extensions.eval-region :as eval-region]
-            [codemirror-next.clojure.keymap :as keymap]
-            [codemirror-next.clojure.node :as n]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.test-utils :as test-utils]
+            [nextjournal.clojure-mode.extensions.close-brackets :as close-brackets]
+            [nextjournal.clojure-mode.extensions.match-brackets :as match-brackets]
+            [nextjournal.clojure-mode.extensions.formatting :as format]
+            [nextjournal.clojure-mode.extensions.selection-history :as sel-history]
+            [nextjournal.clojure-mode.extensions.eval-region :as eval-region]
+            [nextjournal.clojure-mode.keymap :as keymap]
+            [nextjournal.clojure-mode.node :as n]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.test-utils :as test-utils]
             [shadow.resource :as rc]
-            [codemirror-next.clojure.util :as u]))
+            [nextjournal.clojure-mode.util :as u]))
 
 (def fold-node-props
   (let [coll-span (fn [^js tree] #js{:from (inc (n/start tree))
diff --git a/src/main/nextjournal/clojure_mode/chars.cljs b/src/main/nextjournal/clojure_mode/chars.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure.chars
+(ns nextjournal.clojure-mode.chars
   (:require ["@codemirror/next/text" :as text]))
 
 (defn pair-lookup [char-pairs ^string char]
diff --git a/src/main/nextjournal/clojure_mode/clojure.grammar b/src/main/nextjournal/clojure_mode/clojure.grammar
diff --git a/src/main/nextjournal/clojure_mode/commands.cljs b/src/main/nextjournal/clojure_mode/commands.cljs
@@ -1,12 +1,12 @@
-(ns codemirror-next.clojure.commands
+(ns nextjournal.clojure-mode.commands
   (:require ["@codemirror/next/commands" :as commands :refer [defaultKeymap]]
             ["@codemirror/next/state" :refer [EditorState IndentContext]]
             [applied-science.js-interop :as j]
-            [codemirror-next.clojure.util :as u]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.clojure.node :as n]
-            [codemirror-next.clojure.extensions.formatting :as format]
-            [codemirror-next.clojure.extensions.selection-history :as sel-history]))
+            [nextjournal.clojure-mode.util :as u]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.node :as n]
+            [nextjournal.clojure-mode.extensions.formatting :as format]
+            [nextjournal.clojure-mode.extensions.selection-history :as sel-history]))
 
 (defn view-command [f]
   (j/fn [^:js {:keys [^js state dispatch]}]
diff --git a/src/main/nextjournal/clojure_mode/extensions/close_brackets.cljs b/src/main/nextjournal/clojure_mode/extensions/close_brackets.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure.extensions.close-brackets
+(ns nextjournal.clojure-mode.extensions.close-brackets
   (:require ["w3c-keyname" :refer [keyName]]
             ["@codemirror/next/view" :as view]
             ["@codemirror/next/state" :refer [EditorState
@@ -8,12 +8,12 @@
                                               Extension]]
             ["@codemirror/next/text" :as text :refer [Text]]
             [applied-science.js-interop :as j]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.clojure.node :as n]
-            [codemirror-next.clojure.chars :as chars]
-            [codemirror-next.clojure.util :as u :refer [from-to]]
-            [codemirror-next.test-utils :as test-utils]
-            [codemirror-next.clojure.commands :as commands]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.node :as n]
+            [nextjournal.clojure-mode.chars :as chars]
+            [nextjournal.clojure-mode.util :as u :refer [from-to]]
+            [nextjournal.clojure-mode.test-utils :as test-utils]
+            [nextjournal.clojure-mode.commands :as commands]
             [clojure.string :as str]))
 
 (defn in-string? [state pos]
diff --git a/src/main/nextjournal/clojure_mode/extensions/eval_region.cljs b/src/main/nextjournal/clojure_mode/extensions/eval_region.cljs
@@ -1,11 +1,11 @@
-(ns codemirror-next.clojure.extensions.eval-region
+(ns nextjournal.clojure-mode.extensions.eval-region
   (:require
    ["@codemirror/next/state" :as state :refer [StateEffect StateField Facet precedence]]
    ["@codemirror/next/view" :as view :refer [EditorView Decoration keymap]]
    ["w3c-keyname" :refer [keyName]]
    [applied-science.js-interop :as j]
-   [codemirror-next.clojure.util :as u]
-   [codemirror-next.clojure.node :as n]
+   [nextjournal.clojure-mode.util :as u]
+   [nextjournal.clojure-mode.node :as n]
    [clojure.string :as str]))
 
 (defn uppermost-edge-here
diff --git a/src/main/nextjournal/clojure_mode/extensions/formatting.cljs b/src/main/nextjournal/clojure_mode/extensions/formatting.cljs
@@ -1,11 +1,11 @@
-(ns codemirror-next.clojure.extensions.formatting
+(ns nextjournal.clojure-mode.extensions.formatting
   (:require ["@codemirror/next/language" :as language :refer [IndentContext]]
             ["@codemirror/next/state" :refer [EditorState Transaction]]
             ["@codemirror/next/view" :as view]
             ["@codemirror/next/commands" :as commands]
             [applied-science.js-interop :as j]
-            [codemirror-next.clojure.util :as u]
-            [codemirror-next.clojure.node :as n]))
+            [nextjournal.clojure-mode.util :as u]
+            [nextjournal.clojure-mode.node :as n]))
 
 ;; CodeMirror references
 ;; IndentContext https://codemirror.net/6/docs/ref/#state.IndentContext
diff --git a/src/main/nextjournal/clojure_mode/extensions/match_brackets.cljs b/src/main/nextjournal/clojure_mode/extensions/match_brackets.cljs
@@ -1,13 +1,13 @@
-(ns codemirror-next.clojure.extensions.match-brackets
+(ns nextjournal.clojure-mode.extensions.match-brackets
   (:require
     ["@codemirror/next/state" :refer [EditorState
                                       StateField
                                       Extension]]
     ["@codemirror/next/view" :refer [EditorView themeClass
                                      Decoration DecorationSet]]
     [applied-science.js-interop :as j]
-    [codemirror-next.clojure.node :as n]
-    [codemirror-next.clojure.util :as u]))
+    [nextjournal.clojure-mode.node :as n]
+    [nextjournal.clojure-mode.util :as u]))
 
 (def base-theme
   (->>
diff --git a/src/main/nextjournal/clojure_mode/extensions/selection_history.cljs b/src/main/nextjournal/clojure_mode/extensions/selection_history.cljs
@@ -1,9 +1,9 @@
-(ns codemirror-next.clojure.extensions.selection-history
+(ns nextjournal.clojure-mode.extensions.selection-history
   (:require ["@codemirror/next/state" :refer [Facet Extension EditorSelection StateField]]
             [applied-science.js-interop :as j]
-            [codemirror-next.clojure.util :as u]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.clojure.node :as n]))
+            [nextjournal.clojure-mode.util :as u]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.node :as n]))
 
 (def event-annotation (u/user-event-annotation "selectionhistory"))
 
diff --git a/src/main/nextjournal/clojure_mode/keymap.cljs b/src/main/nextjournal/clojure_mode/keymap.cljs
@@ -1,7 +1,7 @@
-(ns codemirror-next.clojure.keymap
+(ns nextjournal.clojure-mode.keymap
   (:require ["@codemirror/next/commands" :as commands :refer [defaultKeymap]]
             [clojure.set :as set]
-            [codemirror-next.clojure.commands :as cmd]))
+            [nextjournal.clojure-mode.commands :as cmd]))
 
 (defn update-some
   "Updates keys of map when key has value"
diff --git a/src/main/nextjournal/clojure_mode/live_grammar.cljs b/src/main/nextjournal/clojure_mode/live_grammar.cljs
@@ -1,7 +1,7 @@
-(ns codemirror-next.clojure.live-grammar
+(ns nextjournal.clojure-mode.live-grammar
   (:require ["lezer-generator" :as lg]
             [shadow.resource :as rc]
-            [codemirror-next.clojure.node :as n]))
+            [nextjournal.clojure-mode.node :as n]))
 
 ;;for dev, it's useful to build the parser in the browser
 (def parser
diff --git a/src/main/nextjournal/clojure_mode/node.cljs b/src/main/nextjournal/clojure_mode/node.cljs
@@ -1,13 +1,13 @@
-(ns codemirror-next.clojure.node
+(ns nextjournal.clojure-mode.node
   (:refer-clojure :exclude [coll? ancestors string? empty? regexp? name range resolve type])
   (:require ["lezer-tree" :as lz-tree]
             ["lezer" :as lezer]
             ["lezer-clojure" :as lezer-clj]
             ["@codemirror/next/language" :as language]
             [clojure.core :as core]
             [applied-science.js-interop :as j]
-            [codemirror-next.clojure.util :as u]
-            [codemirror-next.clojure.selections :as sel]))
+            [nextjournal.clojure-mode.util :as u]
+            [nextjournal.clojure-mode.selections :as sel]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Node props are marked in the grammar and distinguish categories of nodes
diff --git a/src/main/nextjournal/clojure_mode/selections.cljs b/src/main/nextjournal/clojure_mode/selections.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure.selections
+(ns nextjournal.clojure-mode.selections
   (:refer-clojure :exclude [range])
   (:require ["@codemirror/next/state" :refer [EditorSelection]]))
 
diff --git a/src/main/nextjournal/clojure_mode/test_utils.cljs b/src/main/nextjournal/clojure_mode/test_utils.cljs
@@ -1,10 +1,10 @@
-(ns codemirror-next.test-utils
+(ns nextjournal.clojure-mode.test-utils
   (:require ["@codemirror/next/state" :as cm-state
              :refer [EditorState EditorSelection Extension StateCommand
                      ChangeSet ChangeDesc TransactionSpec StrictTransactionSpec]]
             [applied-science.js-interop :as j]
             [clojure.string :as str]
-            [codemirror-next.clojure.extensions.formatting :as format]))
+            [nextjournal.clojure-mode.extensions.formatting :as format]))
 
 ;; (de)serialize cursors| and <selections> for testing
 
diff --git a/src/main/nextjournal/clojure_mode/util.cljs b/src/main/nextjournal/clojure_mode/util.cljs
@@ -1,4 +1,4 @@
-(ns codemirror-next.clojure.util
+(ns nextjournal.clojure-mode.util
   (:require [applied-science.js-interop :as j]
             ["@codemirror/next/state" :refer [EditorSelection
                                               ChangeSet
@@ -7,7 +7,7 @@
                                               StrictTransactionSpec
                                               StateEffect
                                               Transaction]]
-            [codemirror-next.clojure.selections :as sel]))
+            [nextjournal.clojure-mode.selections :as sel]))
 
 (defn user-event-annotation [event-name]
   (.. Transaction -userEvent (of event-name)))
diff --git a/src/test/nextjournal/clojure_mode_tests.cljs b/src/test/nextjournal/clojure_mode_tests.cljs
@@ -1,18 +1,18 @@
-(ns codemirror-next.clojure-tests
+(ns nextjournal.clojure-mode-tests
   (:require ["lezer-clojure" :as lz]
             ["@codemirror/next/state" :refer [EditorState]]
             [applied-science.js-interop :as j]
             [cljs.test :refer [is are testing deftest]]
-            [codemirror-next.clojure :as cm-clojure]
-            [codemirror-next.test-utils :as test-utils]
-            [codemirror-next.clojure.extensions.close-brackets :as close-brackets]
-            [codemirror-next.clojure.commands :as commands]
-            [codemirror-next.clojure.extensions.formatting :as format]
-            [codemirror-next.clojure.live-grammar :as live-grammar]
-            [codemirror-next.clojure.util :as u]
-            [codemirror-next.clojure.selections :as sel]
-            [codemirror-next.clojure.extensions.selection-history :as sel-history]
-            [codemirror-next.clojure.extensions.match-brackets :as match-brackets]))
+            [nextjournal.clojure-mode :as cm-clojure]
+            [nextjournal.clojure-mode.test-utils :as test-utils]
+            [nextjournal.clojure-mode.extensions.close-brackets :as close-brackets]
+            [nextjournal.clojure-mode.commands :as commands]
+            [nextjournal.clojure-mode.extensions.formatting :as format]
+            [nextjournal.clojure-mode.live-grammar :as live-grammar]
+            [nextjournal.clojure-mode.util :as u]
+            [nextjournal.clojure-mode.selections :as sel]
+            [nextjournal.clojure-mode.extensions.selection-history :as sel-history]
+            [nextjournal.clojure-mode.extensions.match-brackets :as match-brackets]))
 
 ;; TODO
 ;; set up testing flow

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(ns codemirror-next.clojure.chars`
	`1`	`+(ns nextjournal.clojure-mode.chars`
`2`	`2`	`(:require ["@codemirror/next/text" :as text]))`
`3`	`3`
`4`	`4`	`(defn pair-lookup [char-pairs ^string char]`