Indentation cleanup, added smart_brackets and smart_insertions, and more #284

eidheim · 2016-09-05T21:00:28Z

@d3rrial, @zalox and others: I need testing of this PR before merge:

Added move one ) instead of insert, which is very nice after autocomplete (Autogenerated closing brackets #281)
Major cleanup of the indenting code, it's actually much faster compared to current master, and additionally more readable (I hope).
smart_insertions
Various other improvements

…en appropriate

…ved begin/end_user_action from control-up/down

eidheim · 2016-09-05T21:06:23Z

And the indentation is improved as well. For instance it should now correctly indent:

some_function(true, 42,
              [] {//enter here

, that will lead to:

some_function(true, 42,
              [] {
  //cursor here
}

insunaa · 2016-09-05T21:50:00Z

void asdf(std::string& superduperlongvariablenamewtf, std::string& andanotheronewhowouldbelievethis,
          std::string& thisiswaytoomuch){

          }

Is the indent here as intended? Looks strange to me.

Other than that the PR looks good to me.

eidheim · 2016-09-05T21:52:06Z

@d3rrial Thank you, that is definitely a bug. I'll fix it Tomorrow.

eidheim · 2016-09-06T10:19:50Z

I fixed the bug @d3rrial mentioned. Also improved indentation when writing constructor implementations on multiple lines. Let me know if there are other issues:)

eidheim · 2016-09-06T11:35:48Z

See also the last commit. You can now avoid using arrow keys when for instance writing:

auto c=std::make_shared<int>(10);

insunaa · 2016-09-06T11:37:09Z

src/source.h

    bool find_open_curly_bracket_backward(Gtk::TextIter iter, Gtk::TextIter &found_iter);
    bool find_close_curly_bracket_forward(Gtk::TextIter iter, Gtk::TextIter &found_iter);
-    long open_close_paranthesis_count(Gtk::TextIter iter);
+    long open_close_bracket_count(Gtk::TextIter iter, unsigned int left_bracket, unsigned int right_bracket);


unsigned int? Are you sure? Wouldn't that mean the '(' has to be cast from char? Or does Clang handle single quoted symbols differently?

*iter returns unsigned int since it is a UTF-8 character. So I do the cast automatically in the function parameters. At least the tests passed:)

Well it wasn't an error, at most I would have expected the compiler to throw a warning. As long as it works, it's all good :)

insunaa · 2016-09-06T11:51:02Z

auto c=std::make_shared<int>(10);
Works well, but not flawlessly (this might be out of scope for this PR, tho):

when I type auto c=std::make_sha I get an autocomplete suggestion for

auto c=std::make_shared<typename _Tp>(_Args &&__args...)

where my cursor sits in the angled bracketes with typename_Tp being highlighted (so it's overwritten when I start typing). To get past that initial > after the typename_Tp I still have to use the arrow key to skip it, tho. Other than that, it works perfectly.

eidheim · 2016-09-06T11:54:51Z

In the case of auto c=std::make_shared<typename _Tp>(_Args &&__args...) and you replace typename _Tp you should get moved when entering > just before the >. You should be able to enter both template argument and function argument without using the arrow keys after using autocompletion on std::make_shared.

insunaa · 2016-09-06T11:59:06Z

This doesn't work for me. Could it be because of different keyboard layouts / keyval differences?

eidheim · 2016-09-06T11:59:36Z

Yeah, tested on Linux. Have to find the right key that works (GDK_KEY_greater works on OS X).

insunaa · 2016-09-06T12:05:12Z

I just tested and GDK_Key_greater is keycode 62, but 62 is also they keyval for > for me, so that's probably not the cause...

eidheim · 2016-09-06T12:08:18Z

The problem is searching for < and > keys it seems. I'll see if I can fix it later.

insunaa · 2016-09-06T12:18:33Z

Well, < and > are also comparison operators after all. In the case where it's used as a templating mechanism, I think it's enough to stop as soon as any other type of bracket is found. I can't think of a situation where <...)...> or <...]...> or <...}...> / <...(...> or <...[...> or <...{...>would be valid constructs.

auto a=crazytemplate<std::string, void*, int,
                     double, size_t>(...);

This has to remain valid, tho...

Edit: Are typeof() functions used in templating? Because if they are, then this is probably a moot point.

…ion arguments of autocompleted templated functions. Also selects the text in the function arguments after pressing '('.

insunaa · 2016-09-06T15:00:52Z

Looks good to me, even works with nested templates. Haven't done any edge-case tests for false positives yet, but I haven't had any false negatives. 👍

eidheim · 2016-09-06T15:03:20Z

Thank you, good to hear. At least there is some progress:)

eidheim · 2016-09-06T15:10:33Z

I made the rules for the movements very strict so that they will not happen unless you want them to, hopefully.

insunaa · 2016-09-06T15:20:02Z

While I personally love this feature / these movements and will/would use them all the time, for some people this might be an inconvenience (I can't fathom how, because they behave just like regular, solid brackets in any case other than when you type in a bracket which is already there) so I think it might be best if this was put into a setting in the config file.

eidheim · 2016-09-06T15:21:48Z

I'm thinking that too. I'll use it myself, but we should maybe have it disabled by default. What do you think @zalox ?

zalox · 2016-09-06T15:30:11Z

See #281 (comment).

I see no reason to not enable these features by default. It would effectively improve the coding experience for new users. People like me, that don't like magic features, know how to disable them and keep quiet as long as there is an option to do so.

…omment character

eidheim · 2016-09-07T05:52:17Z

So what should we call this bracket feature in the preferences? smart_brackets? I'll add some comment as well (smart_brackets_comment).

eidheim · 2016-09-07T08:27:14Z

Not completely sure about the preference item name smart_brackets, but at least the functionality is there.

eidheim · 2016-09-10T08:35:29Z

Fixed the spellcheck issue on undo/redo/pasting.

zalox · 2016-09-11T12:40:17Z

Shouldn't the { also be smart_inserted?

eidheim · 2016-09-11T12:44:57Z

I tried doing smart insertion of {}, but found that too often that was not what I wanted. Additionally, we already have smart indentation and insertion of } after pressing enter after {, and this leads to far less false positives.

…ssions

eidheim · 2016-09-12T18:20:51Z

@zalox This PR should be getting ready for merge. I added some more improvements that should be pretty safe. The biggest change is the indentation cleanup, and that seems to work fine.

…ing deprecated nodes in preferences

…f juCi++

eidheim · 2016-09-13T17:06:48Z

@zalox this PR should now be ready for merge!:)

eidheim · 2016-09-15T07:05:18Z

I'll merge this now as this PR is stable and contains numerous improvements.

eidheim added 2 commits September 5, 2016 17:13

Fixes cppit#281: )-key moves cursor forward instead of inserting ) wh…

bb8109b

…en appropriate

Minor: fixed tab size that in a few files would be set to 0, and remo…

2379bca

…ved begin/end_user_action from control-up/down

Indentation cleanup and improvements

92f93c9

eidheim force-pushed the indentation_cleanup branch from 57984df to 92f93c9 Compare September 6, 2016 10:18

insunaa reviewed Sep 6, 2016
View reviewed changes

eidheim force-pushed the indentation_cleanup branch from 689e330 to 51d4134 Compare September 6, 2016 14:51

Added move on '>' and '(' in '>(' when filling out template and funct…

ab2f699

…ion arguments of autocompleted templated functions. Also selects the text in the function arguments after pressing '('.

eidheim force-pushed the indentation_cleanup branch from 51d4134 to ab2f699 Compare September 6, 2016 15:01

Smart brackets: added exception where a single ' did not count as a c…

0d5f6f4

…omment character

Added preference item: smart_brackets

2150557

eidheim force-pushed the indentation_cleanup branch 2 times, most recently from 564c868 to 55650ac Compare September 10, 2016 08:35

eidheim force-pushed the indentation_cleanup branch 6 times, most recently from fff7bfc to 3b8ec87 Compare September 10, 2016 16:36

eidheim added 2 commits September 10, 2016 22:44

Spellcheck cleanup and improvements

25544a1

Now uses grip when choosing Compile and run on a markdown file

780fe03

eidheim force-pushed the indentation_cleanup branch from 3b8ec87 to 780fe03 Compare September 10, 2016 20:45

eidheim added 5 commits September 12, 2016 14:01

Added keypad keys home, end, up, down, left, right to key check expre…

de879bc

…ssions

Cleanup of menu item activations

b547747

Added info messages when no action happens from menu items

c9f2aa0

Minor fixes to key_press_events

ab82cbe

Smart paste now also works on selected text

ba93408

eidheim changed the title ~~Indentation cleanup, added smart_brackets and smart_insertions~~ Indentation cleanup, added smart_brackets and smart_insertions, and more Sep 12, 2016

eidheim added 2 commits September 13, 2016 11:12

Renamed smart_insertions to start_inserts, and fixed a bug when remov…

e3452d9

…ing deprecated nodes in preferences

Now updates directory view text color when theme is changed outside o…

16eb16b

…f juCi++

eidheim force-pushed the indentation_cleanup branch from e77fc26 to 5d4fd20 Compare September 13, 2016 16:33

Now adds semicolon after lambda unless the lambda is a parameter

43eaad0

eidheim force-pushed the indentation_cleanup branch from 5d4fd20 to 43eaad0 Compare September 13, 2016 16:55

eidheim merged commit 43eaad0 into cppit:master Sep 15, 2016

eidheim deleted the indentation_cleanup branch September 15, 2016 07:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Indentation cleanup, added smart_brackets and smart_insertions, and more #284

Indentation cleanup, added smart_brackets and smart_insertions, and more #284

eidheim commented Sep 5, 2016 •

edited

eidheim commented Sep 5, 2016

insunaa commented Sep 5, 2016 •

edited

eidheim commented Sep 5, 2016

eidheim commented Sep 6, 2016 •

edited

eidheim commented Sep 6, 2016 •

edited

insunaa Sep 6, 2016

eidheim Sep 6, 2016

insunaa Sep 6, 2016

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016 •

edited

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016 •

edited

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016 •

edited

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

zalox commented Sep 6, 2016 •

edited

eidheim commented Sep 7, 2016

eidheim commented Sep 7, 2016

eidheim commented Sep 10, 2016

zalox commented Sep 11, 2016

eidheim commented Sep 11, 2016

eidheim commented Sep 12, 2016

eidheim commented Sep 13, 2016

eidheim commented Sep 15, 2016

Indentation cleanup, added smart_brackets and smart_insertions, and more #284

Indentation cleanup, added smart_brackets and smart_insertions, and more #284

Conversation

eidheim commented Sep 5, 2016 • edited

eidheim commented Sep 5, 2016

insunaa commented Sep 5, 2016 • edited

eidheim commented Sep 5, 2016

eidheim commented Sep 6, 2016 • edited

eidheim commented Sep 6, 2016 • edited

insunaa Sep 6, 2016

Choose a reason for hiding this comment

eidheim Sep 6, 2016

Choose a reason for hiding this comment

insunaa Sep 6, 2016

Choose a reason for hiding this comment

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016 • edited

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016 • edited

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016 • edited

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

eidheim commented Sep 6, 2016

insunaa commented Sep 6, 2016

eidheim commented Sep 6, 2016

zalox commented Sep 6, 2016 • edited

eidheim commented Sep 7, 2016

eidheim commented Sep 7, 2016

eidheim commented Sep 10, 2016

zalox commented Sep 11, 2016

eidheim commented Sep 11, 2016

eidheim commented Sep 12, 2016

eidheim commented Sep 13, 2016

eidheim commented Sep 15, 2016

eidheim commented Sep 5, 2016 •

edited

insunaa commented Sep 5, 2016 •

edited

eidheim commented Sep 6, 2016 •

edited

eidheim commented Sep 6, 2016 •

edited

eidheim commented Sep 6, 2016 •

edited

insunaa commented Sep 6, 2016 •

edited

insunaa commented Sep 6, 2016 •

edited

zalox commented Sep 6, 2016 •

edited