Merge #330

330: Syntax: Fix extern in fn type. r=ehuss a=ehuss

<img width="628" alt="image" src="https://user-images.githubusercontent.com/43198/43736545-d666e596-9972-11e8-8306-ed732d8b3fa7.png">


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

Author: bors[bot]

RustEnhanced.sublime-syntax

@@ -446,12 +446,6 @@ contexts:
 
   generic-angles-contents:
     - include: comments
-    - match: \bextern\b
-      scope: keyword.other.rust
-      push:
-        - include: strings
-        - match: '(?=\S)'
-          pop: true
     - include: type-slice
     - match: '(?=>)'
       pop: true
@@ -512,6 +506,12 @@ contexts:
           scope: punctuation.definition.type.end.rust
           pop: true
         - include: type-any-identifier
+    - match: \bextern\b
+      scope: keyword.other.rust
+      push:
+        - include: strings
+        - match: '(?=\S)'
+          pop: true
     - include: type
     - include: type-slice
     - match: '\b_\b'

tests/syntax-rust/syntax_test_struct.rs

@@ -78,18 +78,23 @@ struct Val (f64,);
 //              ^ punctuation.definition.group.end
 //               ^ punctuation.terminator
 
-// TODO: Fix extern.
 struct F {
     f: extern "C" fn(x: u8, ... /* comment */),
+//     ^^^^^^ meta.struct meta.block keyword.other
+//            ^^^ meta.struct meta.block string.quoted.double
+//                ^^ meta.struct meta.block storage.type.function
+//                              ^^^^^^^^^^^^^ meta.struct meta.block meta.group comment.block
     g: extern "C" fn(x: u8, /* comment */ ...),
+//                          ^^^^^^^^^^^^^ meta.struct meta.block meta.group comment.block
     h: extern "C" fn(x: u8, ...),
     i: extern "C" fn(
         x: u8,
+//         ^^ meta.struct meta.block meta.group storage.type
         // comment 4
+//      ^^^^^^^^^^^^^ meta.struct meta.block meta.group comment.line.double-slash
         y: String, // comment 3
+//                 ^^^^^^^^^^^^^ meta.struct meta.block meta.group comment.line.double-slash
         z: Foo,
-        // comment
-        ... // comment 2
     ),
 }