Merge #322 #323 #324

322: Syntax: Unreserve reserved keywords. r=ehuss a=ehuss

<img width="573" alt="image" src="https://user-images.githubusercontent.com/43198/43735841-8daddd7a-9970-11e8-8cc7-7e085abd0ac5.png">


323: Syntax: Rework enums. r=ehuss a=ehuss

Enums weren't supporting type parameters, among other things.

<img width="515" alt="image" src="https://user-images.githubusercontent.com/43198/43736027-1e6cd550-9971-11e8-8369-d50c61927922.png">


324: Syntax: Support comments near struct/union. r=ehuss a=ehuss

<img width="555" alt="image" src="https://user-images.githubusercontent.com/43198/43736116-5f5e8306-9971-11e8-87f3-663f8ca9950b.png">


Co-authored-by: Eric Huss <[email protected]>

Author: bors[bot]

RustEnhanced.sublime-syntax

@@ -7,6 +7,7 @@ file_extensions:
 scope: source.rust
 variables:
   identifier: '(?:[[:alpha:]][_[:alnum:]]*|_[_[:alnum:]]+)'
+  camel_ident: '\b_*[A-Z][a-zA-Z0-9_]*[a-z][a-zA-Z0-9_]*\b'
   escaped_byte: '\\([nrt0\"''\\]|x\h{2})'
   escaped_char: '\\([nrt0\"''\\]|x[0-7]\h|u\{(?:\h_*){1,6}\})'
   int_suffixes: '[iu](?:8|16|32|64|128|size)'
@@ -90,13 +91,9 @@ contexts:
       scope: storage.type.impl.rust
       push: impl-definition
 
-    - match: '\b(enum)\s+({{identifier}})\b'
-      captures:
-        1: storage.type.enum.rust
-        2: entity.name.enum.rust
-      push:
-        - meta_scope: meta.enum.rust
-        - include: statements-block
+    - match: '\benum\b'
+      scope: storage.type.enum.rust
+      push: enum-identifier
 
     - match: \b(let|const|static)\b
       scope: storage.type.rust
@@ -107,15 +104,6 @@ contexts:
     - match: \bmod\b
       scope: storage.type.module.rust
 
-    - match: \bstruct\b
-      scope: storage.type.struct.rust
-
-    - match: \bimpl\b
-      scope: storage.type.impl.rust
-
-    - match: \benum\b
-      scope: storage.type.enum.rust
-
     - match: \btype\b
       scope: storage.type.type.rust
 
@@ -142,7 +130,7 @@ contexts:
     - match: \b(as|in|box)\b
       scope: keyword.operator.rust
 
-    - match: \b(virtual|proc|alignof|become|offsetof|priv|pure|sizeof|typeof|unsized|yield|do|abstract|final|override|macro)\b
+    - match: \b(virtual|become|priv|typeof|unsized|do|abstract|final|override|macro)\b
       scope: invalid.illegal.rust
 
     - match: \b(true|false)\b
@@ -540,6 +528,7 @@ contexts:
 
   struct-identifier:
     - meta_scope: meta.struct.rust
+    - include: comments
     - match: '{{identifier}}(?=<)'
       scope: entity.name.struct.rust
       set:
@@ -608,6 +597,7 @@ contexts:
 
   union-identifier:
     - meta_scope: meta.union.rust
+    - include: comments
     - match: '{{identifier}}(?=<)'
       scope: entity.name.union.rust
       set:
@@ -634,6 +624,67 @@ contexts:
     - match: '(?=;)'
       pop: true
 
+  enum-identifier:
+    - meta_scope: meta.enum.rust
+    - include: comments
+    - match: '{{identifier}}(?=<)'
+      scope: entity.name.enum.rust
+      set:
+        - meta_scope: meta.enum.rust meta.generic.rust
+        - match: '(?=<)'
+          push: generic-angles
+        - match: ''
+          set: enum-maybe-where
+    - match: '{{identifier}}'
+      scope: entity.name.enum.rust
+      set: enum-maybe-where
+
+  enum-maybe-where:
+    - meta_scope: meta.enum.rust
+    - include: comments
+    - match: '(?=\bwhere\b)'
+      push: impl-where
+    - match: '\{'
+      scope: punctuation.definition.block.begin.rust
+      set: enum-body
+
+  enum-body:
+    - meta_scope: meta.enum.rust
+    - include: comments
+    - include: attribute
+    - match: '\}'
+      scope: punctuation.definition.block.end.rust
+      pop: true
+    - match: '\b[[:upper:]_][[:upper:][:digit:]_]*\b'
+      scope: constant.other.rust
+      push: enum-variant-type
+    - match: '{{camel_ident}}'
+      scope: storage.type.source.rust
+      push: enum-variant-type
+    - match: '{{identifier}}'
+      push: enum-variant-type
+
+  enum-variant-type:
+    - include: comments
+    - match: '(?=\})'
+      pop: true
+    - match: ','
+      pop: true
+    - match: '='
+      set: enum-discriminant
+    - match: '(?=\()'
+      push: struct-tuple
+    - match: '(?=\{)'
+      push: struct-classic
+
+  enum-discriminant:
+    - match: ','
+      pop: true
+    - match: '(?=\})'
+      pop: true
+    # This is just constant-expression, but we don't have that defined.
+    - include: statements
+
   macro-block:
     - meta_scope: meta.macro.rust
     - match: '\}'

tests/syntax-rust/syntax_test_attributes.rs

@@ -47,5 +47,13 @@ pub struct Claim {
     pub date: String,
 }
 
+enum E {
+    #[allow(dead_code)]
+//  ^^^^^^^^^^^^^^^^^^^ meta.enum meta.annotation
+//    ^^^^^ support.function
+    A(i32),
+//    ^^^ meta.enum meta.struct meta.group storage.type
+}
+
 // TODO: FIXME - Generic parameters.
 // unsafe impl<#[may_dangle] T: ?Sized> Drop for Box<T> { }

tests/syntax-rust/syntax_test_enum.rs

@@ -5,19 +5,20 @@ enum OperatingSystem
 // ^^^^^^^^^^^^^^^^^ meta.enum
 //   ^^^^^^^^^^^^^^^ entity.name.enum
 {
-// <- meta.enum meta.block punctuation.definition.block.begin
+// <- meta.enum punctuation.definition.block.begin
     Osx,
+//  ^^^ meta.enum storage.type.source
     Windows,
     Linux,
     Bsd(String),
     //  ^^^^^^ support.type
     Info { field: i32, value: str }
-    //   ^ meta.block meta.block punctuation.definition.block.begin
+    //   ^ punctuation.definition.block.begin
     //            ^^^ storage.type
     //                        ^^^ storage.type
-    //                            ^ meta.block meta.block punctuation.definition.block.end
+    //                            ^ meta.block punctuation.definition.block.end
 }
-// <- meta.enum meta.block punctuation.definition.block.end
+// <- meta.enum punctuation.definition.block.end
 
 let q = Message::Quit;
 //      ^^^^^^^ storage.type.source
@@ -33,3 +34,35 @@ let m = Message::Move { x: 50, y: 200 };
 //                    ^^^^^^^^^^^^^^^^^ meta.block
 //                         ^^ constant.numeric.integer.decimal
 //                                ^^^ constant.numeric.integer.decimal
+
+enum Discriminant {
+    A = 1,
+//  ^ meta.enum constant.other
+//      ^ meta.enum constant.numeric.integer.decimal
+    V1 = 0xABC,
+//  ^^ meta.enum constant.other
+//       ^^^^^ meta.enum constant.numeric.integer.hexadecimal
+    V2,
+//  ^^ meta.enum constant.other
+    SomeValue = 123,
+//  ^^^^^^^^^ meta.enum storage.type.source
+//              ^^^ meta.enum constant.numeric.integer.decimal
+    V3 = (1<<4),
+//  ^^ meta.enum constant.other
+//       ^^^^^^ meta.enum meta.group
+//        ^ constant.numeric.integer.decimal
+//         ^^ keyword.operator
+//           ^ constant.numeric.integer.decimal
+    lowercase,
+//  ^^^^^^^^^^^ meta.enum
+}
+
+// Enum type parameters.
+enum E<'asdf> {}
+//    ^^^^^^^ meta.enum meta.generic
+//     ^^^^^storage.modifier.lifetime
+enum C<T> where T: Copy {}
+//    ^^^ meta.enum meta.generic
+//        ^^^^^^^^^^^^^ meta.enum meta.where
+//        ^^^^^ keyword.other
+//                 ^^^^ support.type

tests/syntax-rust/syntax_test_misc.rs

@@ -9,3 +9,37 @@ unsafe impl<T> Send for Interned<T> {}
 //^^^^ storage.modifier
 pub unsafe trait Alloc { }
 //  ^^^^^^ storage.modifier
+
+// Previously reserved keywords now unreserved.
+let pure = 1;
+//  ^^^^ -invalid.illegal.rust
+let sizeof = 1;
+//  ^^^^^^ -invalid.illegal.rust
+let alignof = 1;
+//  ^^^^^^^ -invalid.illegal.rust
+let offsetof = 1;
+//  ^^^^^^^^ -invalid.illegal.rust
+let proc = 1;
+//  ^^^^ -invalid.illegal.rust
+
+// Reserved keywords.
+let virtual = 1;
+//  ^^^^^^^ invalid.illegal.rust
+let become = 1;
+//  ^^^^^^ invalid.illegal.rust
+let priv = 1;
+//  ^^^^ invalid.illegal.rust
+let typeof = 1;
+//  ^^^^^^ invalid.illegal.rust
+let unsized = 1;
+//  ^^^^^^^ invalid.illegal.rust
+let do = 1;
+//  ^^ invalid.illegal.rust
+let abstract = 1;
+//  ^^^^^^^^ invalid.illegal.rust
+let final = 1;
+//  ^^^^^ invalid.illegal.rust
+let override = 1;
+//  ^^^^^^^^ invalid.illegal.rust
+let macro = 1;
+//  ^^^^^ invalid.illegal.rust

tests/syntax-rust/syntax_test_struct.rs

@@ -31,6 +31,9 @@ struct Pair(i32, i32);
 //               ^^^ storage.type
 //                   ^ - meta.struct
 
+struct /*comment*/ Comments {}
+//     ^^^^^^^^^^^ meta.struct comment.block
+
 struct Point
 // ^^^^^^^^^ meta.struct
 {

tests/syntax-rust/syntax_test_union.rs

@@ -35,3 +35,6 @@ pub union Foo<'a, Y: Baz>
 // that we don't accidentally interpret it as a keyword.
 fn union() {}
 // ^^^^^ meta.function entity.name.function
+
+union /*comment*/ U {}
+//    ^^^^^^^^^^^ meta.union comment.block