Added impl capture. #96

maccoda · 2017-02-17T12:10:47Z

Hopefully able to fix issues on incorrect impl highlighting like #7 and maybe #86

KalitaAlexey · 2017-02-17T12:48:48Z

grammars/rust.cson

@@ -404,14 +404,16 @@
    ]
  }
  # Implementation
-  {


I suppose you shouldn't have removed the line.
Why did you do that?

That was accidental! 😱 Apologies.

@maccoda,
Okay. Revert it and the brace at the end which you have deleted.

KalitaAlexey · 2017-02-17T12:51:46Z

Hello @maccoda,
Thank you for your PR.
Currently I am short of time hence I am not able to check it myself.
Could you attach screenshots?
For the following impls:

impl A {}

impl A for B {}

impl<A> B for C {}

impl<A> B<A> for C<A> {}

impl<'a> B for C {}

impl<'a> B<'a> for C<'a> {}

impl<'a, A> B<'a> for C<'a> {}

impl<'a, A> B<'a, A> for C<'a, A> {}

maccoda · 2017-02-17T13:06:18Z

Hi,
You are welcome. No worries will use those as tests. The last three examples do not appear to work off the regex so I will work on those and then update.

KalitaAlexey · 2017-02-17T13:21:31Z

grammars/rust.cson

@@ -429,5 +432,5 @@
        'match': '\\bfor\\b'
      }
    ]
-  }
+


You forgot about the brace.

KalitaAlexey · 2017-02-17T13:22:56Z

The last three examples do not appear to work off the regex so I will work on those and then update.

I hope you find the regex.
If you didn't I would accept the PR anyway because it is improvement.

maccoda · 2017-02-17T14:19:25Z

Alright so it turns out those missing braces are what helped actually because I believe there is an order in which Atom checks and because this is a complex one grabbing the entire line it should be up the top. Hence the move you will see in the next commit. I have also attached a few screenshots of the tests you provided.

maccoda · 2017-02-17T14:21:07Z

As you will be able to see the trait and type/struct names are now highlighted but next goal will be to get the type parameters also captured.

KalitaAlexey · 2017-02-17T14:45:44Z

Please attach a screenshot for the code:

'a;
&'a i;

I want 'a in impl to be drawn like in the example above.

KalitaAlexey · 2017-02-17T14:48:25Z

Also I want A in <A> to be drawn as A in impl A.

maccoda · 2017-02-17T22:30:30Z

OK I will have a look into that and see what I can get

maccoda · 2017-02-17T23:54:59Z

Newton Dark

One Dark

One Light

KalitaAlexey

It is cool.

KalitaAlexey · 2017-02-18T07:31:41Z

grammars/rust.cson

@@ -159,11 +159,46 @@
      { 'include': '#std_types' }
      { 'include': '#std_traits' }
      { 'include': '#type_params' }
+      {
+        'name': 'entity.name.type.rust'
+        'match': '\\b[A-Za-z]+\\b'


A type's name may contain digits and underscore:
https://is.gd/5NukLU

KalitaAlexey · 2017-02-18T07:36:45Z

grammars/rust.cson

+      {
+        'name': 'entity.name.type.rust'
+        'match': '\\b[A-Za-z]+\\b'
+      }


Extract the block from here and place it after 144 line:

'std_traits': { 'comment': 'Standard library trait' 'name': 'support.type.std.rust' 'match': '\\b(ToOwned|ToString)\\b' } 'Type': { 'comment': 'A type' 'name': 'entity.name.type.rust' 'match': '\\b[A-Za-z]+\\b' }

And add after 161 line:

{ 'include': '#type' }

KalitaAlexey · 2017-02-18T07:37:55Z

grammars/rust.cson

-  }
+
+
+


Remove the empty lines.

KalitaAlexey · 2017-02-18T07:38:33Z

grammars/rust.cson

+        {
+          'name': 'entity.name.type.rust'
+          'match': '\\b[A-Za-z]+\\b'
+        }


Use the "#Type" from the previous comment.

maccoda · 2017-02-18T22:24:14Z

Addressed your comments. Hope this is closer to what we are wanting.

KalitaAlexey · 2017-02-19T08:30:03Z

@maccoda,
I am going to check it.
After that I will merge it.

Thank you

KalitaAlexey · 2017-02-19T09:00:02Z

@maccoda,
I have checked it.
Everything is fine.

KalitaAlexey · 2017-02-19T09:11:00Z

@maccoda,
Except that tests are failed.

KalitaAlexey · 2017-02-19T09:12:31Z

@maccoda,
Could you fix the tests and add new ones for the cases?

KalitaAlexey · 2017-02-19T09:27:31Z

grammars/rust.cson

+  'type': {
+    'comment': 'A type'
+    'name': 'entity.name.type.rust'
+    'match': '\\b[A-Za-z0-9_]+\\b'


It is wrong regex because it matches for _, 0 and etc.

The correct is \\b([A-Za-z][A-Za-z0-9_]*|_[A-Za-z][A-Za-z0-9_]*)\\b.

The correct is \\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b

KalitaAlexey · 2017-02-19T09:28:36Z

grammars/rust.cson

+    # Implementation
+  {
+    'comment': 'Implementation'
+    'begin': '\\b(impl)'


It should be \\b(impl)\\b because otherwise it would match implementation.

maccoda · 2017-04-25T02:31:50Z

Sorry took so long to get back to this, I believe the previous regex didn't work correctly for something like

fn do_whatever<T: Send+Share+Whatever, U: Freeze> (param: &T, other_param: u32) -> Option<U>;

I believe now all the tests should be passing and your comments addressed.

KalitaAlexey · 2017-04-25T06:28:55Z

@maccoda,
Thank you for your great work.
As soon as I check it, I will merge it.

KalitaAlexey · 2017-04-28T15:21:49Z

Sorry I forgot about you. I will look tomorrow.

KalitaAlexey · 2017-05-02T16:34:18Z

Oups. I did it again. I will look at it now.

KalitaAlexey · 2017-05-02T17:58:29Z

I have prepared tests for your changes.
Unfortunately, not everything works as I want it to work.
It works incorrectly for:

impl<'a, T> A {}

It tokenizes , T as a single type parameter.
I am going to merge your changes as is because it is hard work.
I will fix the remaining cases myself.

KalitaAlexey · 2017-05-02T18:09:50Z

@aeschli,
Hello. I am writing to you since you told me to notify you when I want to update update the grammar.
Could you please update the grammar?

maccoda · 2017-05-02T21:46:15Z

@KalitaAlexey thanks for that, sorry didn't get as you were wanting but hopefully it is a step in the right direction ☺️

Added impl capture.

04c97d5

KalitaAlexey reviewed Feb 17, 2017

View reviewed changes

Fix brace removal.

cb51ee0

KalitaAlexey reviewed Feb 17, 2017

View reviewed changes

grammars/rust.cson Outdated

@@ -429,5 +432,5 @@

'match': '\\bfor\\b'

}

]

}

Copy link

Collaborator

KalitaAlexey Feb 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot about the brace.

Addressed all example impl combinations.

987e36d

Changed approach for impl highlighting.

05906d0

KalitaAlexey suggested changes Feb 18, 2017

View reviewed changes

Pulled out type capture.

b5fa99c

KalitaAlexey approved these changes Feb 19, 2017

View reviewed changes

KalitaAlexey suggested changes Feb 19, 2017

View reviewed changes

fixed for passing tests

eaee694

KalitaAlexey merged commit c24ef01 into zargony:master May 2, 2017

This was referenced Jun 27, 2017

Updated grammar to highlight the identifier on impl blocks #54

Closed

Recognize minimal impl traits (Rust RFC 1522) #86

Open

zargony added a commit that referenced this pull request Jun 27, 2017

Add tests for types in impl statements (closes #7, implemented by #96)

3da5c74

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added impl capture. #96

Added impl capture. #96

maccoda commented Feb 17, 2017

KalitaAlexey Feb 17, 2017

maccoda Feb 17, 2017

KalitaAlexey Feb 17, 2017

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

KalitaAlexey Feb 17, 2017

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

maccoda commented Feb 17, 2017

KalitaAlexey commented Feb 17, 2017 •

edited

Loading

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

maccoda commented Feb 17, 2017

KalitaAlexey left a comment

KalitaAlexey Feb 18, 2017

KalitaAlexey Feb 18, 2017

KalitaAlexey Feb 18, 2017

KalitaAlexey Feb 18, 2017

maccoda commented Feb 18, 2017

KalitaAlexey commented Feb 19, 2017

KalitaAlexey commented Feb 19, 2017

KalitaAlexey commented Feb 19, 2017 •

edited

Loading

KalitaAlexey commented Feb 19, 2017 •

edited

Loading

KalitaAlexey Feb 19, 2017

KalitaAlexey Feb 20, 2017

KalitaAlexey Feb 19, 2017

maccoda commented Apr 25, 2017

KalitaAlexey commented Apr 25, 2017

KalitaAlexey commented Apr 28, 2017

KalitaAlexey commented May 2, 2017

KalitaAlexey commented May 2, 2017

KalitaAlexey commented May 2, 2017

maccoda commented May 2, 2017

Added impl capture. #96

Added impl capture. #96

Conversation

maccoda commented Feb 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

Choose a reason for hiding this comment

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

maccoda commented Feb 17, 2017

KalitaAlexey commented Feb 17, 2017 • edited Loading

KalitaAlexey commented Feb 17, 2017

maccoda commented Feb 17, 2017

maccoda commented Feb 17, 2017

KalitaAlexey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maccoda commented Feb 18, 2017

KalitaAlexey commented Feb 19, 2017

KalitaAlexey commented Feb 19, 2017

KalitaAlexey commented Feb 19, 2017 • edited Loading

KalitaAlexey commented Feb 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maccoda commented Apr 25, 2017

KalitaAlexey commented Apr 25, 2017

KalitaAlexey commented Apr 28, 2017

KalitaAlexey commented May 2, 2017

KalitaAlexey commented May 2, 2017

KalitaAlexey commented May 2, 2017

maccoda commented May 2, 2017

KalitaAlexey commented Feb 17, 2017 •

edited

Loading

KalitaAlexey commented Feb 19, 2017 •

edited

Loading

KalitaAlexey commented Feb 19, 2017 •

edited

Loading