Merge pull request #6 from yangsu/master

Allow dashes in import statements
vihangm · Mar 1, 2016 · 1a8fe02 · 1a8fe02
2 parents 66e1640 + 2886fdf
commit 1a8fe02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Protobuf.JSON-tmLanguage b/Protobuf.JSON-tmLanguage
@@ -268,7 +268,7 @@
                     "name": "keyword.source.proto"
                 }
             },
-            "match": "(package|import)(?=(\\s+)([\"]?[A-Za-z][A-Za-z0-9_./]*[\"]?)(;))"
+            "match": "(package|import)(?=(\\s+)([\"]?[A-Za-z][A-Za-z0-9-_./]*[\"]?)(;))"
         }
     }
-}
+}
diff --git a/Protobuf.YAML-tmLanguage b/Protobuf.YAML-tmLanguage
@@ -117,7 +117,7 @@ repository:
       match: (CODE\_SIZE|SPEED)
 
   packaging:
-    match: (package|import)(?=(\s+)(["]?[A-Za-z][A-Za-z0-9_./]*["]?)(;))
+    match: (package|import)(?=(\s+)(["]?[A-Za-z][A-Za-z0-9-_./]*["]?)(;))
     captures:
       '1': {name: keyword.source.proto}
       '2': {name: entity.name.tag}

diff --git a/Protobuf.tmLanguage b/Protobuf.tmLanguage
@@ -348,7 +348,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>(package|import)(?=(\s+)(["]?[A-Za-z][A-Za-z0-9_./]*["]?)(;))</string>
+			<string>(package|import)(?=(\s+)(["]?[A-Za-z][A-Za-z0-9-_./]*["]?)(;))</string>
 		</dict>
 		<key>service</key>
 		<dict>