Use CMs electric chars #9387

marcelgerber · 2014-10-01T16:57:59Z

This fixes multiple issues:
#1324, #8434, #8723, #8980, #9120

I verified #8395 (fixed by #8439) is still fixed.

There's one behaviour change (tracked via codemirror/codemirror5#2812):
In a switch statement (JS), the cursor automatically indents 2 units, but back-indents as soon as you type "case".

@peterflynn You once noted (on IRC) you saw flaws with CM's implementation, could you please take a look?
cc @JeffryBooher

peterflynn · 2014-10-01T19:17:16Z

Two quick thoughts:

IIRC one of the reasons we forked this in the first place was indentation jumping around when typing ":" in object literals. We'll need to make sure that stays fixed, and if not we should look into merging our fix for that issue upstream to CM so our code can stay more in sync.
It seems worth doing a little more verification on Brackets doesn't recognize existing indentation when auto-indenting close braces #8395, since looking at the CM implementation it's pretty clear they don't have any of the code that was added in Recognize existing indentation when indenting close braces #8439 -- they always call indentLine() immediately and directly. If Brackets doesn't recognize existing indentation when auto-indenting close braces #8395 is indeed still fixed, it would be good to understand why.

peterflynn · 2014-10-01T19:20:45Z

Oh, IIRC another bug was that typing ":" inside a comment would cause the indentation to jump also...

marcelgerber · 2014-10-01T19:24:08Z

Well, #8395 is still fixed as I left the code in (see diff) :)

peterflynn · 2014-10-01T19:30:22Z

Oh I see -- didn't realize you found a way to keep that. Looks like that code needs to be made multi-cursor-aware though, otherwise #8434 isn't really fully fixed.

marcelgerber · 2014-10-04T17:14:48Z

I just did some further tests and couldn't find any issues with ":", at least in JS mode.
I'd still be happy if you could test it yourself.

marcelgerber · 2014-10-04T17:38:16Z

@peterflynn FYI, I fixed the anti-orphan code to support multiple cursors.

peterflynn · 2014-10-05T02:57:29Z

Cool, thanks for making that update! I don't have a lot of cycles next week to do any testing, but hopefully someone else on the team can pick this up sooner.

pthiess · 2014-10-27T18:20:20Z

@marcelgerber Hey Marcel, we are locking down for 1.0 but it will go into the next release.

prafulVaishnav · 2015-03-30T06:29:44Z

@marcelgerber Picking this for review.

prafulVaishnav · 2015-04-07T09:19:16Z

src/editor/Editor.js

    /**
     * @private
     * Handle CodeMirror key events.
     * @param {!Event} event
     */
    Editor.prototype._handleKeypressEvents = function (event) {
-        this._checkElectricChars(event);
+        var keyStr = String.fromCharCode(event.which || event.keyCode);


@marcelgerber Hii.. Can you please write this in separate function as it is specific to electricChars handling.

marcelgerber · 2015-04-07T14:53:58Z

@prafulVaishnav Done. Please let me know when you'd like to merge so I can squash commits.

prafulVaishnav · 2015-04-08T08:39:59Z

@marcelgerber You can squash commit. I will merge it then.

marcelgerber · 2015-04-08T09:52:53Z

@prafulVaishnav Ready.

prafulVaishnav · 2015-04-08T10:48:59Z

src/editor/Editor.js

+        var keyStr = String.fromCharCode(event.which || event.keyCode);
+
+        if (/[\]\{\}\)]/.test(keyStr)) {
+            this._removeWhitespaceAfterBrace();


@marcelgerber Please update the function name to _handleWhitespaceForElectricChars

Oops. Fixed.

Use CMs electric chars

prafulVaishnav · 2015-04-08T11:44:13Z

@marcelgerber Thanks.. It must fix various issues. I will check and close them all.

marcelgerber · 2015-04-08T12:59:30Z

In the description above, I listed some issues that should be fixed now.

marcelgerber · 2015-04-08T17:10:33Z

I've just had a look at all the referenced issues myself - they are indeed all fixed.
Note for #8723: Checkout 7c7d429 so the line numbers are correct.

marcelgerber · 2015-04-08T17:31:51Z

I also filed codemirror/codemirror5#3188, suggesting an event on electric char indent, so we can call _handleWhitespaceForElectricChars every time an electric char is handled, to also handle languages with more special electric chars like XML, Verilog, Ruby, or even JavaScripts case and default properly.

prafulVaishnav · 2015-04-09T02:42:26Z

@marcelgerber Thanks.. We will track it and once it is there we will make the change.

marcelgerber force-pushed the cm-electric-chars branch 2 times, most recently from 83c5d74 to 5423209 Compare October 4, 2014 17:36

peterflynn added the PR Triage Complete label Oct 13, 2014

peterflynn mentioned this pull request Feb 10, 2015

HTML Templating un-indents template helpers #10564

Open

peterflynn mentioned this pull request Apr 7, 2015

Ruby mode not un-indenting on "end" statement #10829

Closed

prafulVaishnav reviewed Apr 7, 2015
View reviewed changes

marcelgerber force-pushed the cm-electric-chars branch from 7bb54bf to b341de5 Compare April 8, 2015 09:52

marcelgerber force-pushed the cm-electric-chars branch from b341de5 to 6449fdf Compare April 8, 2015 10:41

prafulVaishnav reviewed Apr 8, 2015
View reviewed changes

Use CMs electric char handling

531c8d0

marcelgerber force-pushed the cm-electric-chars branch from 6449fdf to 531c8d0 Compare April 8, 2015 11:36

prafulVaishnav added a commit that referenced this pull request Apr 8, 2015

Merge pull request #9387 from MarcelGerber/cm-electric-chars

97ed87b

Use CMs electric chars

prafulVaishnav merged commit 97ed87b into adobe:master Apr 8, 2015

marcelgerber deleted the cm-electric-chars branch April 8, 2015 11:44

marcelgerber mentioned this pull request Apr 8, 2015

Brackets indents code even with smartIndent off #10823

Closed

This was referenced Apr 9, 2015

Auto-Identation and Switch Statements #1324

Closed

Electric char auto-indentation doesn't work with multiple cursors #8434

Closed

Auto-indent doesn't scroll editor #8723

Closed

core-ai-bot mentioned this pull request Aug 30, 2021

[CLOSED] Use CMs electric chars brackets-archive/bracketsIssues#8386

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use CMs electric chars #9387

Use CMs electric chars #9387

marcelgerber commented Oct 1, 2014

peterflynn commented Oct 1, 2014

peterflynn commented Oct 1, 2014

marcelgerber commented Oct 1, 2014

peterflynn commented Oct 1, 2014

marcelgerber commented Oct 4, 2014

marcelgerber commented Oct 4, 2014

peterflynn commented Oct 5, 2014

pthiess commented Oct 27, 2014

prafulVaishnav commented Mar 30, 2015

prafulVaishnav Apr 7, 2015

marcelgerber commented Apr 7, 2015

prafulVaishnav commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

prafulVaishnav Apr 8, 2015

marcelgerber Apr 8, 2015

prafulVaishnav commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

prafulVaishnav commented Apr 9, 2015

Use CMs electric chars #9387

Use CMs electric chars #9387

Conversation

marcelgerber commented Oct 1, 2014

peterflynn commented Oct 1, 2014

peterflynn commented Oct 1, 2014

marcelgerber commented Oct 1, 2014

peterflynn commented Oct 1, 2014

marcelgerber commented Oct 4, 2014

marcelgerber commented Oct 4, 2014

peterflynn commented Oct 5, 2014

pthiess commented Oct 27, 2014

prafulVaishnav commented Mar 30, 2015

prafulVaishnav Apr 7, 2015

Choose a reason for hiding this comment

marcelgerber commented Apr 7, 2015

prafulVaishnav commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

prafulVaishnav Apr 8, 2015

Choose a reason for hiding this comment

marcelgerber Apr 8, 2015

Choose a reason for hiding this comment

prafulVaishnav commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

marcelgerber commented Apr 8, 2015

prafulVaishnav commented Apr 9, 2015