fix unindent; tag 0.8.7

calcit-lang · Sep 17, 2023 · e4934c6 · e4934c6
1 parent 791eb35
commit e4934c6
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 32 deletions.
diff --git a/calcit.cirru b/calcit.cirru
diff --git a/compact.cirru b/compact.cirru
@@ -1,6 +1,6 @@
 
 {} (:package |app)
-  :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.6)
+  :configs $ {} (:init-fn |app.server/main!) (:reload-fn |app.server/reload!) (:version |0.8.7)
     :modules $ [] |lilac/ |memof/ |recollect/ |cumulo-util.calcit/ |ws-edn.calcit/ |bisection-key/
   :entries $ {}
     :client $ {} (:init-fn |app.client/main!) (:reload-fn |app.client/reload!)
@@ -2350,7 +2350,9 @@
                       and
                         = :def $ :kind bookmark
                         every? queries $ fn (y)
-                          .includes? (:extra bookmark) y
+                          .includes?
+                            or (:extra bookmark) "\""
+                            , y
                     .sort-by $ if
                       blank? $ :query state
                       , bookmark->str query-length
@@ -3572,7 +3574,7 @@
                 (:ir/expr-after op-data) (ir/expr-after db op-data sid op-id op-time)
                 (:ir/expr-replace op-data) (ir/expr-replace db op-data sid op-id op-time)
                 (:ir/indent op-data) (ir/indent db op-data sid op-id op-time)
-                (:ir/unindent op-data) (ir/unindent db op-data sid op-id op-time)
+                (:ir/unindent) (ir/unindent db sid op-id op-time)
                 (:ir/unindent-leaf op-data) (ir/unindent-leaf db op-data sid op-id op-time)
                 (:ir/update-leaf op-data) (ir/update-leaf db op-data sid op-id op-time)
                 (:ir/duplicate op-data) (ir/duplicate db op-data sid op-id op-time)
@@ -4264,7 +4266,7 @@
                     do (println "\"Toggle comment at wrong place," node) node
         |unindent $ %{} :CodeEntry (:doc |)
           :code $ quote
-            defn unindent (db op-data session-id op-id op-time)
+            defn unindent (db session-id op-id op-time)
               let
                   writer $ get-in db ([] :sessions session-id :writer)
                   bookmark $ get (:stack writer) (:pointer writer)
@@ -4277,7 +4279,9 @@
                     fn (expr)
                       if
                         = 1 $ count (:data expr)
-                        last $ first (:data expr)
+                        nth
+                          &map:destruct $ :data expr
+                          , 1
                         , expr
                   -> db
                     update-in

diff --git a/package.cirru b/package.cirru
@@ -1,15 +1,15 @@
 
 {}
   :dependencies $ {}
-    |calcit-lang/lilac |0.4.0-a2
-    |calcit-lang/memof |0.0.14
-    |Respo/respo.calcit |0.16.0-a3
-    |Respo/respo-ui.calcit |0.5.0-a3
-    |Respo/respo-markdown.calcit |0.4.0-a3
-    |calcit-lang/recollect |0.0.14
-    |calcit-lang/bisection-key |0.0.15
-    |Respo/respo-message.calcit |0.0.7
-    |Respo/respo-feather.calcit |0.3.0-a3
-    |Respo/alerts.calcit |0.9.0-a2
-    |mvc-works/ws-edn.calcit |0.0.9
-    |Cumulo/cumulo-util.calcit |0.0.6
+    |calcit-lang/lilac |main
+    |calcit-lang/memof |main
+    |Respo/respo.calcit |main
+    |Respo/respo-ui.calcit |main
+    |Respo/respo-markdown.calcit |main
+    |calcit-lang/recollect |main
+    |calcit-lang/bisection-key |main
+    |Respo/respo-message.calcit |main
+    |Respo/respo-feather.calcit |main
+    |Respo/alerts.calcit |main
+    |mvc-works/ws-edn.calcit |main
+    |Cumulo/cumulo-util.calcit |main
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcit/editor",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Tree Editor for Calcit Language",
   "bin": {
     "ct": "./server.mjs"