Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Special formatting for comment form trailing bracket #1227

Merged
merged 32 commits into from
Jul 11, 2021
Merged

Special formatting for comment form trailing bracket #1227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a2266c6
Fix doc typo
bpringe May 12, 2021
a1afb57
Merge branch dev into published
PEZ May 12, 2021
dc4709e
Add missing `npm i` step
PEZ May 20, 2021
210e816
Merge branch dev into published
PEZ May 26, 2021
dedfd2c
Merge branch dev into published
PEZ Jun 4, 2021
35f1490
Merge branch dev into published
PEZ Jun 6, 2021
cd54a37
Add merch page to calva.io
PEZ Jun 22, 2021
31cf82b
Merch for German Amazon store available
PEZ Jun 23, 2021
157a8cf
Merge branch dev into published
PEZ Jun 24, 2021
b4cbac3
Merge branch dev into published
PEZ Jun 29, 2021
43f223b
Workaround for paredit's inability to support multiline
Jun 30, 2021
48e9e25
Revert Changes to plugin defaults
Jun 30, 2021
3b6c9e8
Add documentation.
Jun 30, 2021
fc32136
Merge branch 'dev' into 610-workaround
JBlaz Jul 1, 2021
ff5912c
Update merch [skip ci]
PEZ Jul 3, 2021
4c316d7
Merch Rich Comments 2
PEZ Jul 3, 2021
8915691
Merch: Symbol + rich comments in German store
PEZ Jul 4, 2021
5b0c797
Update Luminus instruictions
PEZ Jul 4, 2021
4313d41
Merge branch dev into published
PEZ Jul 4, 2021
24a11b8
Format comment w/ a symbol at closing paren
PEZ Jul 8, 2021
7b1bcd7
Merge branch 'dev' into 610-workaround
PEZ Jul 8, 2021
812d88b
Merge pull request #1220 from JBlaz/610-workaround
PEZ Jul 8, 2021
cec1d77
Issue-1228: merge cljfmt.edn file contents into calva formatting defa…
mchughs Jul 8, 2021
b560006
Merge branch 'dev' into dev
mchughs Jul 8, 2021
42f390c
Merge pull request #1229 from mchughs/dev
PEZ Jul 10, 2021
2062ad0
Format comment w/ a symbol at closing paren
PEZ Jul 8, 2021
bfff0cb
Merge branch '1224-comment-trail-bracket' of github.com:BetterThanTom…
PEZ Jul 10, 2021
01b50b9
Make special comment form formatting optional
PEZ Jul 10, 2021
20042d8
Add two tests
PEZ Jul 11, 2021
3b5ccdd
Add docs about comment formatting
PEZ Jul 11, 2021
5dcf36b
Rename variable
PEZ Jul 11, 2021
8c2753e
Crate Rich Comments doc page [skip ci]
PEZ Jul 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Workaround for paredit's inability to support multiline 
Disable paredit when more than one cursor is in use so at least we get the default vscode behavior.
  • Loading branch information
Jase committed Jun 30, 2021
commit 43f223ba190d50f38cf73999ccbda79aa361c8c6
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Changes to Calva.

## [Unreleased]
- Workaround: [Paredit commands don't propagate to multiple cursors](https://github.com/BetterThanTomorrow/calva/issues/610)

## [2.0.202] - 2021-06-29
- Fix: [Custom repl commands are not evaluated in specified ns if different than current ns](https://github.com/BetterThanTomorrow/calva/issues/1196)
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,28 +1580,28 @@
"mac": "ctrl+left",
"win": "alt+left",
"linux": "alt+left",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
},
{
"command": "paredit.backwardSexp",
"mac": "alt+left",
"win": "ctrl+left",
"linux": "ctrl+left",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorBeforeComment"
},
{
"command": "paredit.forwardSexp",
"mac": "ctrl+right",
"win": "alt+right",
"linux": "alt+right",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && !config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
},
{
"command": "paredit.forwardSexp",
"mac": "alt+right",
"win": "ctrl+right",
"linux": "ctrl+right",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && config.calva.paredit.hijackVSCodeDefaults && !calva:cursorInComment || calva:cursorAfterComment"
},
{
"command": "paredit.forwardDownSexp",
Expand Down Expand Up @@ -1638,14 +1638,14 @@
"mac": "shift+alt+right",
"win": "shift+ctrl+right",
"linux": "shift+ctrl+right",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/"
},
{
"command": "paredit.selectBackwardSexp",
"mac": "shift+alt+left",
"win": "shift+ctrl+left",
"linux": "shift+ctrl+left",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/"
},
{
"command": "paredit.selectForwardDownSexp",
Expand Down Expand Up @@ -1687,14 +1687,14 @@
"mac": "ctrl+w",
"win": "shift+alt+right",
"linux": "shift+alt+right",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
},
{
"command": "paredit.sexpRangeContraction",
"mac": "ctrl+shift+w",
"win": "shift+alt+left",
"linux": "shift+alt+left",
"when": "calva:keybindingsEnabled && editorLangId == clojure && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
"when": "calva:keybindingsEnabled && editorLangId == clojure && !editorHasMultipleSelections && editorTextFocus && paredit:keyMap =~ /original|strict/ && !calva:cursorInComment"
},
{
"command": "paredit.slurpSexpForward",
Expand Down