Add support for F# package reference

alecthomas · Apr 26, 2022 · 2aa65db · 2aa65db
1 parent 66a6bc6
commit 2aa65db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lexers/embedded/fsharp.xml b/lexers/embedded/fsharp.xml
@@ -169,6 +169,9 @@
       <rule pattern="``([^`\n\r\t]|`[^`\n\r\t])+``">
         <token type="Name"/>
       </rule>
+      <rule pattern="#[ \t]*(if|endif|else|line|nowarn|light|r|\d+)\b">
+        <token type="CommentPreproc"/>
+      </rule>
       <rule pattern="(!=|#|&amp;&amp;|&amp;|\(|\)|\*|\+|,|-\.|-&gt;|-|\.\.|\.|::|:=|:&gt;|:|;;|;|&lt;-|&lt;\]|&lt;|&gt;\]|&gt;|\?\?|\?|\[&lt;|\[\||\[|\]|_|`|\{|\|\]|\||\}|~|&lt;@@|&lt;@|=|@&gt;|@@&gt;)">
         <token type="Operator"/>
       </rule>
@@ -181,9 +184,6 @@
       <rule pattern="\b(sbyte|byte|char|nativeint|unativeint|float32|single|float|double|int8|uint8|int16|uint16|int32|uint32|int64|uint64|decimal|unit|bool|string|list|exn|obj|enum)\b">
         <token type="KeywordType"/>
       </rule>
-      <rule pattern="#[ \t]*(if|endif|else|line|nowarn|light|\d+)\b.*?\n">
-        <token type="CommentPreproc"/>
-      </rule>
       <rule pattern="[^\W\d][\w&#39;]*">
         <token type="Name"/>
       </rule>
@@ -242,4 +242,4 @@
       </rule>
     </state>
   </rules>
-</lexer>
+</lexer>
diff --git a/lexers/testdata/fsharp/fsharp_package_reference.actual b/lexers/testdata/fsharp/fsharp_package_reference.actual
@@ -0,0 +1 @@
+#r "nuget: Newtonsoft.Json"
diff --git a/lexers/testdata/fsharp/fsharp_package_reference.expected b/lexers/testdata/fsharp/fsharp_package_reference.expected
@@ -0,0 +1,6 @@
+[
+  {"type":"CommentPreproc","value":"#r"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralString","value":"\"nuget: Newtonsoft.Json\""},
+  {"type":"Text","value":"\n"}
+]