Merge branch 'dev'

Author: PEZ

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
       - checkout
       - restore_cache:
           name: Restore dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
       - run:
           name: Install node_modules
           command: cp package.json /tmp && npm install && cp /tmp/package.json .
@@ -19,7 +19,7 @@ jobs:
           command: npx shadow-cljs classpath
       - save_cache:
           name: Save dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
           paths:
             - ./node_modules
             - ~/.m2
@@ -38,7 +38,7 @@ jobs:
       - checkout
       - restore_cache:
           name: Restore dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
       - run:
           name: Update system package lists
           command: sudo apt-get update
@@ -52,21 +52,21 @@ jobs:
       - run:
           name: Download Atom build script
           command: |
-            cd calva/calva-fmt/atom-language-clojure
+            cd src/calva-fmt/atom-language-clojure
             curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh
       - run:
           name: Make build script executable
           command: |
-            cd calva/calva-fmt/atom-language-clojure
+            cd src/calva-fmt/atom-language-clojure
             chmod u+x build-package.sh
       - run:
           name: Run package tests
           command: |
-            cd calva/calva-fmt/atom-language-clojure
+            cd src/calva-fmt/atom-language-clojure
             ./build-package.sh
       - save_cache:
           name: Save dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
           paths:
             - ~/.atom/packages
             - ./node_modules
@@ -79,7 +79,7 @@ jobs:
           path: ~/calva
       - restore_cache:
           name: Restore dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
       - run:
           name: Compile and Run Tests
           command: npm run compile-cljs
@@ -92,7 +92,7 @@ jobs:
           path: ~/calva
       - restore_cache:
           name: Restore dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
       - run:
           name: "Create artifacts workspace"
           command: mkdir /tmp/artifacts
@@ -182,7 +182,7 @@ jobs:
           path: ~/calva
       - restore_cache:
           name: Restore dependencies
-          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "calva/calva-fmt/atom-language-clojure/package.json" }}
+          key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}
       - run:
           name: Publish to the marketplace
           command: |

.vscode/launch.json

@@ -10,7 +10,26 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}"
+                "--extensionDevelopmentPath=${workspaceRoot}",
+            ],
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "env": {
+                "CALVA_DEV_GA": "FUBAR-69796730-4",
+                "DEBUG": "no-debug-universal-analytics"
+            },
+            "outFiles": [
+                "${workspaceFolder}/dist/**/*.js"
+            ]
+        },
+        {
+            "name": "Launch w/ test folder",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "${workspaceFolder}/test-data"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
@@ -22,5 +41,6 @@
                 "${workspaceFolder}/dist/**/*.js"
             ]
         }
+
     ]
 }

CHANGELOG.md

@@ -4,10 +4,12 @@ Changes to Calva.
 ## When time allows, this will be worked on
 - [Support for custom project/workflow commands](https://github.com/BetterThanTomorrow/calva/issues/281)
 
-## Being distilled
-
 ## [Unreleased]
 
+## [2.0.43] - 03.10.2019
+- [Insourcing @tonsky's Clojue Warrior, now named Calva Highlight](https://github.com/BetterThanTomorrow/calva/pull/362)
+- [Update status bar when configuration changed](https://github.com/BetterThanTomorrow/calva/issues/358)
+
 ## [2.0.42] - 29.09.2019
 - [Adding selected calva commands to the editors context menu](https://github.com/BetterThanTomorrow/calva/issues/338)
 - [Fix bug with painting all existing result decoration with the same status](https://github.com/BetterThanTomorrow/calva/issues/353)

README.md

@@ -44,6 +44,12 @@ When something doesn't work and you think there might be a workaround for it, pl
 ## Features
 
 ### At a glance
+- Syntax highlighting, plus:
+  - Rainbow parens
+  - Highlights misplaced brackets
+  - LISP friendly bracket matching
+  - Ignore form (`#_`) dimming and `(comment)` form highlighting
+- Clojure code formatting
 - Quickly and easily get your REPL connected
 - Evaluate code inline
 - Run tests
@@ -102,7 +108,7 @@ Currently [`cider-nrepl` does not provide its test functionality for ClojureScri
 
 ## Calva Paredit and Calva Formatter included
 
-With Calva you also get structural editing using [Paredit](/calva/paredit/README.md) and [formatting](/calva/calva-fmt/README.md).
+With Calva you also get structural editing using [Paredit](/src/paredit/README.md) and [formatting](/src/calva-fmt/README.md).
 
 You really should have a look at the READMEs for those as well. One thing to note about it is that Calva Formatter sets the default keybinding of the **Format Current Form** command to `tab`. Good to know, right?
 
@@ -112,19 +118,27 @@ To make slurping and barfing forward really easy to perform they are bound to `c
 
 ![Disable Mission Control Shortcuts](/assets/mission-control-shortcuts.gif)
 
-### Conflicting with Parinfer extension
+## Calva Highlight
 
-There have been reports of the Parinfer extension and Calva not working too well together. You might to some extent get away with switching off Calva's formatting as-you-type, but also you might not. With Calva it is probably better to learn to use Paredit **slurp** and **barf** and generally rely on Calva's automatic formatting.
+Calva takes care of syntax highlighting, and also provides some features not available through VS Code's highlighting mechanism. These extras inclode rainbow parens, sane bracket matching, and comment form dimming/highlighting.
+
+You are in charge of how brackets and comments are highlighted:
 
-## Clojure Warrior included
+| Setting | Meaning | Example |
+| --- | ------- | ------- |
+| `"calva.highlight.enableBracketColors"` | Enable rainbow colors |  `true` |
+| `"calva.highlight.bracketColors"` | Which colors to use |  `["#000", "#999"]` |
+| `"calva.highlight.cycleBracketColors"` | Whether same colors should be reused for deeply nested brackets | `true` |
+| `"calva.highlight.misplacedBracketStyle"` | Style of misplaced bracket | `{ "border": "2px solid #c33" }` |
+| `"calva.highlight.matchedBracketStyle"` | Style of bracket pair highlight | `{"backgroundColor": "#E0E0E0"}` |
+| `"calva.highlight.ignoredFormStyle"` | Style of `#_...` form | `{"textDecoration": "none; opacity: 0.5"}` |
+| `"calva.highlight.commentFormStyle"` | Style of `(comment ...)` form | `{"fontStyle": "italic"}` |
 
-This extension bundles [@tonsky](https://tonsky.me)'s [Clojure Warrior](https://marketplace.visualstudio.com/items?itemName=tonsky.clojure-warrior). Bringing you, amongst other things, rainbow parens and sane bracket matching.
+The extras are built from **Clojure Warrior**, created by [Nikita Prokopov, a.k.a. @tonsky](https://tonsky.me)'s. Please note that the default styling for `(comment ...)` forms now is to italicize them (instead of dimming). This is to promote using `comment` forms to work with the REPL. See **Something to try first**, above for more on evaluating code in `comment` forms.
 
-Note: If you for some reason do not want rainbow colors, put this in your `settings.json`:
+## Conflicting with Parinfer extension
 
-```json
-    "clojureWarrior.enableBracketColors": false
-```
+There have been reports of the Parinfer extension and Calva not working too well together. You might to some extent get away with switching off Calva's formatting as-you-type, but also you might not. With Calva it is probably better to learn to use Paredit **slurp** and **barf** and generally rely on Calva's automatic formatting.
 
 ## How to contribute
 
@@ -136,7 +150,7 @@ Calva is built using a combination of TypeScript and ClojureScript. The ClojureS
 
 Many people have contributed to Calva. Here are the ones who have engaged in the project as such.
 
-## Current Maintainers:
+### Current Maintainers:
 
 * [Peter Strömberg](https://github.com/PEZ)
 * [Kevin Stehn](https://github.com/kstehn)

assets/cw_screenshot.png

@@ -1,6 +1,6 @@
 {
 	"information_for_contributors": [
-		"This file is generated from ./calva/calva-fmt/atom-language-clojure/grammars/clojure.cson"
+		"This file is generated from ./src/calva-fmt/atom-language-clojure/grammars/clojure.cson"
 	],
 	"name": "Clojure",
 	"scopeName": "source.clojure",

clojure.tmLanguage.json

@@ -20,4 +20,4 @@ I have:
 
 <!-- Remove the checkboxes that do not apply, as Github reports how many are not ticked. 😀-->
 
-Ping: @pez, @kstehn
+Ping: @pez, @kstehn, @cfehse

docs/pull_request_template.md

@@ -0,0 +1,61 @@
+# Things to be done with Calva
+
+The major themes are:
+* Documentation
+* Squash Bugs
+* The Right Features
+* Development Workflow
+* Code Maintainability
+
+## Documentation
+* Video, How to get started with Calva, to support the text on the wiki
+* The Calva settings (which ones are not documented on the wiki?)
+* Replace some outdated GIFs used in the README.
+* Make clear what Calva is about, what stances it takes and where it is heading
+
+## Squash Bugs
+* The test runner sometimes just doesn't work
+* The REPL window can't handle large output. Ideas:
+  * Fix the performance issues (might be a tricky job)
+  * Truncate large output in the REPL window and print it in an untitled Clojure-enabled editor window instead.
+  * Alternative approach:
+    * Integrate the [Monaco Editor](https://microsoft.github.io/monaco-editor/) on which the whole vscode thing is based on in two ways
+      * As the editing area on the bottom 
+      * As a readonly content display of the output
+    * This should probably fix some performance issues
+    * This should improve the editing capabilities of the editing area
+    * All language spezific support (formating, rainbowcolors, intellisense, etc) should be integratable in the editor.
+  * Implement something like CIDER inspect: https://github.com/BetterThanTomorrow/calva/issues/228
+  * Make it super easy to use Calva with REBL
+* Fix the statusbar button default colors (or remove this feature if we don't think it is valuable enough).
+
+## The Right Features
+* Support clj-fmt indent settings.
+* Enable clj-kondo as default Calva linter ([clj-kondo](https://github.com/borkdude/clj-kondo/releases/tag/v2019.09.22-alpha) does support Windows but distributes no binary for Windows)
+* Enable using nrepl in streaming mode
+  * Use this for the test runner
+* Add some basic refactorings support
+* Use ”last opened in” column when opening the REPL window at jack in. (example? I do not fully understand.)
+* Consider not opening the REPL window at jack-in / make it an option.
+* Bettter connection life-cycle control fo shadow-cljs. Either:
+  1. Tap in to the shadow message bus (THeller said that there is such a thing that we can quyery about what shadow-cljs is doing.)
+  1. Run Jack-in in a Task proper and see if we can somehow catch the output. (This is needed for shadow-cljs Jack-in.)
+* Consider supporting REBL out-of-the-box.
+* Add more Calva extension context statuses and use it for more precise command and shortcut enablements.
+* A way to get output pasted in a Clojure-enabled editor window.
+
+## Development Workflow
+* Write a basic smoke test checklist
+* Write an issues template
+* Get a unit test framework in place for the TypeScript code base.
+* Get an integration test framework in place, for automatic smoke testing.
+
+## Code Maintainability
+* We have two ParEdit implementations, we should scrap paredit.js
+* We have two formatters, cljs-lib ormatter and the one in docmirror.
+  * It mmight make sense to keep both for different purposes, but we should fix whatever it is that makes us still keep the `newIndentEngine` setting.
+* Organize Calva functionality in ”components”, more like we do with calva-fmt, ParEdit, and Clojure Warrior.
+* Get better control of Calva state.
+* Clean up extra messy parts of the code. Candidates:
+  * The evaluations module
+  * The annotations module (this is particularly brittle)