[sadikovi]

Requirements

• Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
• All new code requires tests to ensure against regressions

Description of the Change

This PR fixes highlighting of variables that are capitalized or start with capital letter. I fixed by enforcing that the last branch of 'object-types' pattern requires the next word (variable name); and since variable names can start with A-Za-z or _, or $, I added \w|$.

Tested on the code:

class A {
  void func() {
    int g = 1;
    g += 2;
    int G = 1;
    G += 2;
    ABC += 3;
    Abc += 4;

    if (G > g) {
      // do something
      String a = "abc";
    }
  }
}

Alternate Designs

None were considered, though I was experimenting with different changes to see what actually affects the highlighting.

Benefits

Fix problem with highlighting variables starting with capital letters in situations like, but not limited to:

A += 2;
A = 3;
if (A > B) {
  // something
}

Possible Drawbacks

Might break something else, but it passes all tests so far.

Applicable Issues

Closes #76

[sadikovi]

@50Wliu could you review this PR, please? Thanks!

[winstliu]

Nitpick: [\\w$] might be clearer and is typically what we do with languages that accept $ as an identifier. Also I think variables can start with underscores?

[sadikovi]

Yes, you are right. I actually replaced with the following: [A-Za-z$_\\n], which is what we use for start of the variable, and I added new line to cover cases:

String
test = "abc";

With this change, current highlighting is the same as in master branch (which is not exactly the same as inline definition String test = "abc").

[winstliu]

My only concern: I think Java allows multiline variable declarations like

String
test = 3;

Please tell me if I'm wrong. Even if that's allowed, I'm thinking that this change should be merged because uppercase variables are more likely than multiline declarations.

[sadikovi]

I agree. We should push this effort instead. I also updated the line that you commented on. Now highlighting is similar to the master branch for multi-line definitions. See images below:

Master branch:

This patch

@50Wliu Could you review this again? Thanks!

[winstliu]

🚢