Merge pull request #620 from Microsoft/libReference

Add lib reference syntax

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -2369,7 +2369,7 @@ repository:
 
   directives:
     name: comment.line.triple-slash.directive.ts
-    begin: ^(///)\s*(?=<(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|name)\s*=\s*({{quotedStrings}}))+\s*/>\s*$)
+    begin: ^(///)\s*(?=<(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*({{quotedStrings}}))+\s*/>\s*$)
     beginCaptures:
       '1': { name: punctuation.definition.comment.ts }
     end: (?=^)
@@ -2384,7 +2384,7 @@ repository:
         '0': { name: punctuation.definition.tag.directive.ts }
       patterns:
       - name: entity.other.attribute-name.directive.ts
-        match: 'path|types|no-default-lib|name'
+        match: 'path|types|no-default-lib|lib|name'
       - name: keyword.operator.assignment.ts
         match: '='
       - include: '#string'

TypeScript.tmLanguage

@@ -6946,7 +6946,7 @@
         <key>name</key>
         <string>comment.line.triple-slash.directive.ts</string>
         <key>begin</key>
-        <string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
+        <string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -6993,7 +6993,7 @@
                 <key>name</key>
                 <string>entity.other.attribute-name.directive.ts</string>
                 <key>match</key>
-                <string>path|types|no-default-lib|name</string>
+                <string>path|types|no-default-lib|lib|name</string>
               </dict>
               <dict>
                 <key>name</key>

TypeScriptReact.tmLanguage

@@ -6892,7 +6892,7 @@
         <key>name</key>
         <string>comment.line.triple-slash.directive.tsx</string>
         <key>begin</key>
-        <string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
+        <string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -6939,7 +6939,7 @@
                 <key>name</key>
                 <string>entity.other.attribute-name.directive.tsx</string>
                 <key>match</key>
-                <string>path|types|no-default-lib|name</string>
+                <string>path|types|no-default-lib|lib|name</string>
               </dict>
               <dict>
                 <key>name</key>

package-lock.json

@@ -19,7 +19,7 @@
     "mocha": "latest",
     "plist": "latest",
     "typescript": "latest",
-    "vscode-textmate": "latest",
+    "vscode-textmate": "^3",
     "@types/chai": "latest",
     "@types/js-yaml": "latest",
     "@types/mocha": "latest",

package.json

@@ -1,6 +1,7 @@
 original file
 -----------------------------------
 ///<reference path="somePath.ts"/>
+///<reference lib="es2015"/>
 ///<amd-dependency path="somePath.ts"/>
 ///<amd-module name="modulename"/>
 ///<amd-dependency path="someOtherPath.ts" name="someOtherModule"/>
@@ -29,6 +30,27 @@ Grammar: TypeScript.tmLanguage
                                 source.ts comment.line.triple-slash.directive.ts meta.tag.ts string.quoted.double.ts punctuation.definition.string.end.ts
                                  ^^
                                  source.ts comment.line.triple-slash.directive.ts meta.tag.ts punctuation.definition.tag.directive.ts
+>///<reference lib="es2015"/>
+ ^^^
+ source.ts comment.line.triple-slash.directive.ts punctuation.definition.comment.ts
+    ^
+    source.ts comment.line.triple-slash.directive.ts meta.tag.ts punctuation.definition.tag.directive.ts
+     ^^^^^^^^^
+     source.ts comment.line.triple-slash.directive.ts meta.tag.ts entity.name.tag.directive.ts
+              ^
+              source.ts comment.line.triple-slash.directive.ts meta.tag.ts
+               ^^^
+               source.ts comment.line.triple-slash.directive.ts meta.tag.ts entity.other.attribute-name.directive.ts
+                  ^
+                  source.ts comment.line.triple-slash.directive.ts meta.tag.ts keyword.operator.assignment.ts
+                   ^
+                   source.ts comment.line.triple-slash.directive.ts meta.tag.ts string.quoted.double.ts punctuation.definition.string.begin.ts
+                    ^^^^^^
+                    source.ts comment.line.triple-slash.directive.ts meta.tag.ts string.quoted.double.ts
+                          ^
+                          source.ts comment.line.triple-slash.directive.ts meta.tag.ts string.quoted.double.ts punctuation.definition.string.end.ts
+                           ^^
+                           source.ts comment.line.triple-slash.directive.ts meta.tag.ts punctuation.definition.tag.directive.ts
 >///<amd-dependency path="somePath.ts"/>
  ^^^
  source.ts comment.line.triple-slash.directive.ts punctuation.definition.comment.ts

tests/baselines/directives.baseline.txt

@@ -1,4 +1,5 @@
 ///<reference path="somePath.ts"/>
+///<reference lib="es2015"/>
 ///<amd-dependency path="somePath.ts"/>
 ///<amd-module name="modulename"/>
 ///<amd-dependency path="someOtherPath.ts" name="someOtherModule"/>