Improve code highlighter

flow-storm · Oct 17, 2023 · b3cd39f · b3cd39f
1 parent c5f04b5
commit b3cd39f
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 235 deletions.
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
@@ -1,6 +1,6 @@
 {:linters
  {:unresolved-symbol
-  {:exclude [(flow-storm.debugger.ui.utils/event-handler [_ ev mev kev])
+  {:exclude [(flow-storm.debugger.ui.utils/event-handler [_ ev mev kev sev])
              (flow-storm.instrument.forms/definstrumenter)
              ]}}
  :output {:exclude-files ["src-inst/data_readers.clj"]}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,13 @@
 ### New Features 
 
 ### Changes
-        
+
+    - Improved code highlighter. Replaces JavaFX standard TextFlow with RichTextFx CodeArea for improved performance.
+
 ### Bugs fixed
 
+    - Fix #98 Stepping over big forms is very slow
+
 ## 3.7.5 (02-10-2023)
 
 ### New Features 

diff --git a/deps.edn b/deps.edn
@@ -8,30 +8,30 @@
         io.github.clojure/tools.build {:mvn/version "0.9.4" :exclusions [com.google.guava/guava org.slf4j/slf4j-nop]}
         com.github.jpmonettas/hansel {:mvn/version "0.1.78"}
 
-        org.openjfx/javafx-controls {:mvn/version "19.0.2.1"}
-        org.openjfx/javafx-base {:mvn/version "19.0.2.1"}
-        org.openjfx/javafx-graphics {:mvn/version "19.0.2.1"}
-        org.openjfx/javafx-swing {:mvn/version "19.0.2.1"}
+        org.openjfx/javafx-controls {:mvn/version "22-ea+11"}
+        org.openjfx/javafx-base {:mvn/version "22-ea+11"}
+        org.openjfx/javafx-graphics {:mvn/version "22-ea+11"}
+        org.openjfx/javafx-swing {:mvn/version "22-ea+11"}
         org.kordamp.ikonli/ikonli-javafx {:mvn/version "11.5.0"}
         org.kordamp.ikonli/ikonli-materialdesign-pack {:mvn/version "11.5.0"}
         com.github.jpmonettas/j-system-theme-detector {:mvn/version "3.8"}
         nrepl/nrepl {:mvn/version "1.0.0"}
-        org.clojure/data.int-map {:mvn/version "1.2.1"}}
+        org.clojure/data.int-map {:mvn/version "1.2.1"}
+        org.fxmisc.richtext/richtextfx  {:mvn/version "0.11.1"}}
 
  :aliases {:cljs {:extra-deps {cider/cider-nrepl {:mvn/version "0.28.3"}
                                refactor-nrepl/refactor-nrepl {:mvn/version "3.5.2"}
                                cider/piggieback {:mvn/version "0.5.2"}
                                thheller/shadow-cljs {:mvn/version "2.23.3"}}}
 
            :storm {:classpath-overrides {org.clojure/clojure nil}
-                   :extra-deps {com.github.jpmonettas/clojure {:mvn/version "1.12.0-alpha4_3"}}
+                   :extra-deps {com.github.jpmonettas/clojure {:mvn/version "1.11.1-11"}}
                    :jvm-opts [
                               ;; "-Xmx20500m"
-
-                              "-Dflowstorm.startRecording=false"
+                              ;;"-Dflowstorm.startRecording=false"
                               "-Dflowstorm.theme=dark"
                               "-Dclojure.storm.instrumentEnable=true"
-                              "-Dclojure.storm.instrumentOnlyPrefixes=dev"
+                              "-Dclojure.storm.instrumentOnlyPrefixes=dev,cljs"
 
                               "-Dcljs.storm.instrumentOnlyPrefixes=dev"
                               "-Dcljs.storm.instrumentEnable=true"
@@ -40,13 +40,15 @@
            :dev {:extra-paths ["src-dev" "classes"]
 
                  :extra-deps {;; to debug ClojureScript storm
-                              ;; org.clojure/clojurescript {:local/root "/home/jmonetta/my-projects/clojurescript"}
+                              org.clojure/clojurescript {:local/root "/home/jmonetta/my-projects/clojurescript"}
+                              org.clojure/core.async {:mvn/version "1.6.681"}
+                              dorothy/dorothy {:mvn/version "0.0.7"}
                               }
                  :jvm-opts ["-Dvisualvm.display.name=FlowStorm"
                             "-Djdk.attach.allowAttachSelf" "-XX:+UnlockDiagnosticVMOptions" "-XX:+DebugNonSafepoints" ;; for the profilers
 
                             ;; for debugging java code
-                            ;; "-Xdebug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"
+                            ;;"-Xdebug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"
                             ]}
 
            :build {:extra-deps {io.github.clojure/tools.build {:mvn/version "0.9.4"}}

diff --git a/resources/styles.css b/resources/styles.css
@@ -91,8 +91,8 @@
 }
 
 .form-pane.form-background-highlighted {
-	-fx-background-color: -fx-theme-base3;
-}
+	-fx-background-color: -fx-theme-form-highlight;
+} 
 
 .label.defmethod {
 	-fx-text-fill: -fx-theme-defmethod-text;

diff --git a/resources/theme_dark.css b/resources/theme_dark.css
@@ -29,6 +29,7 @@
 	-fx-theme-field-label:                        #de00c0;
 	-fx-theme-breakpoint:                         #ff0000;
 	-fx-theme-breakpoint-continue:                #60d61b;
+    -fx-theme-form-highlight:                     #636363;
 }
 
 .root {
@@ -37,3 +38,4 @@
         -fx-control-inner-background:  -fx-theme-base1;
 }
 
+
diff --git a/resources/theme_light.css b/resources/theme_light.css
@@ -29,6 +29,7 @@
 	-fx-theme-field-label:                        #9c0084;
 	-fx-theme-breakpoint:                         #ff0000;
 	-fx-theme-breakpoint-continue:                #369658;
+    -fx-theme-form-highlight:                     #BBBBBB;
 }
 
 .root {