Skip to content

Fix Vim float highlighting and some keyword highlight #10888

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.

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

Merged
merged 2 commits into from
Dec 11, 2013

Conversation

chris-morgan
Copy link
Member

Fix up float highlighting in Vim.

This fixes a regression introduced in #10793.

Having a colorscheme which highlights Float the same as Number (I
believe most do), I hadn't noticed that having the special case of "5."
floats (which was one of the added features in #10793) last made it take
precedence, and so it was left to @thestinger to notice it.

The regression meant that in 5.0, the 5. was a rustFloat (linked
by default to Float) and the 0 was a rustDecNumber (linked by
default to Number), and for 5.0f32 the 5. was a rustFloat and
the 0f32 was a second rustFloat (and thus appeared correctly, though
for the wrong reason).

Vim keyword highlighting improvements.

  • Removed the log keyword;
  • Removed keyword duplicates;
  • Highlighted const as Error rather than StorageClass; and
  • Highlighted all the reserved keywords as Error rather than as
    Keyword.

(As usual, these highlightings can be overridden if desired.)

This fixes a regression introduced in rust-lang#10793.

Having a colorscheme which highlights Float the same as Number (I
believe most do), I hadn't noticed that having the special case of "5."
floats (which was one of the added features in rust-lang#10793) last made it take
precedence, and so it was left to @thestinger to notice it.

The regression meant that in `5.0`, the `5.` was a `rustFloat` (linked
by default to `Float`) and the `0` was a `rustDecNumber` (linked by
default to `Number`), and for `5.0f32` the `5.` was a `rustFloat` and
the `0f32` was a second `rustFloat` (and thus appeared correctly, though
for the wrong reason).
- Removed the `log` keyword;
- Removed keyword duplicates;
- Highlighted `const` as `Error` rather than `StorageClass`; and
- Highlighted all the reserved keywords as `Error` rather than as
  `Keyword`.

(As usual, these highlightings can be overridden if desired.)
bors added a commit that referenced this pull request Dec 11, 2013
…estinger

### Fix up float highlighting in Vim.

This fixes a regression introduced in #10793.

Having a colorscheme which highlights Float the same as Number (I
believe most do), I hadn't noticed that having the special case of "5."
floats (which was one of the added features in #10793) last made it take
precedence, and so it was left to @thestinger to notice it.

The regression meant that in `5.0`, the `5.` was a `rustFloat` (linked
by default to `Float`) and the `0` was a `rustDecNumber` (linked by
default to `Number`), and for `5.0f32` the `5.` was a `rustFloat` and
the `0f32` was a second `rustFloat` (and thus appeared correctly, though
for the wrong reason).

### Vim keyword highlighting improvements.

- Removed the `log` keyword;
- Removed keyword duplicates;
- Highlighted `const` as `Error` rather than `StorageClass`; and
- Highlighted all the reserved keywords as `Error` rather than as
  `Keyword`.

(As usual, these highlightings can be overridden if desired.)
@bors bors closed this Dec 11, 2013
@bors bors merged commit f39c883 into rust-lang:master Dec 11, 2013
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
…r=flip1995

Remove `CARGO_UNSTABLE_SPARSE_REGISTRY` env from ci

changelog: none

Sparse registry is the default so we don't need these anymore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants