Merge pull request microsoft#49 from kiootic/named-ref-out

Add support for named ref/out arguments
OmniSharp · Mar 25, 2017 · 4d0e50c · 4d0e50c
2 parents 9b02ada + c888852
commit 4d0e50c
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 3 deletions.
diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
@@ -5094,7 +5094,7 @@
         <array>
           <dict>
             <key>include</key>
-            <string>#expression</string>
+            <string>#argument</string>
           </dict>
         </array>
       </dict>

diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
@@ -3053,7 +3053,7 @@ repository:
     end: "(?=(,|\\)|\\]))"
     patterns: [
       {
-        include: "#expression"
+        include: "#argument"
       }
     ]
   argument:

diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
@@ -1958,7 +1958,7 @@ repository:
       '2': { name: punctuation.separator.colon.cs }
     end: (?=(,|\)|\]))
     patterns:
-    - include: '#expression'
+    - include: '#argument'
 
   argument:
     patterns:

diff --git a/test/expressions.tests.ts b/test/expressions.tests.ts
@@ -1354,6 +1354,44 @@ class C
                 ]);
             });
 
+            it("named ref argument", () => {
+                const input = Input.InMethod(`var o = P[x: ref y];`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Keywords.Var,
+                    Token.Identifiers.LocalName("o"),
+                    Token.Operators.Assignment,
+                    Token.Variables.Property("P"),
+                    Token.Punctuation.OpenBracket,
+                    Token.Identifiers.ParameterName("x"),
+                    Token.Punctuation.Colon,
+                    Token.Keywords.Modifiers.Ref,
+                    Token.Variables.ReadWrite("y"),
+                    Token.Punctuation.CloseBracket,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
+            it("named out argument", () => {
+                const input = Input.InMethod(`var o = P[x: out y];`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Keywords.Var,
+                    Token.Identifiers.LocalName("o"),
+                    Token.Operators.Assignment,
+                    Token.Variables.Property("P"),
+                    Token.Punctuation.OpenBracket,
+                    Token.Identifiers.ParameterName("x"),
+                    Token.Punctuation.Colon,
+                    Token.Keywords.Modifiers.Out,
+                    Token.Variables.ReadWrite("y"),
+                    Token.Punctuation.CloseBracket,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
             it("member of generic with no arguments", () => {
                 const input = Input.InMethod(`var o = C<int>.P[];`);
                 const tokens = tokenize(input);
@@ -1758,6 +1796,38 @@ long total = (data["bonusGame"]["win"].AsLong) * data["bonusGame"]["betMult"].As
                 ]);
             });
 
+            it("named ref argument", () => {
+                const input = Input.InMethod(`M(x: ref y);`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Identifiers.ParameterName("x"),
+                    Token.Punctuation.Colon,
+                    Token.Keywords.Modifiers.Ref,
+                    Token.Variables.ReadWrite("y"),
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
+            it("named out argument", () => {
+                const input = Input.InMethod(`M(x: out y);`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Identifiers.ParameterName("x"),
+                    Token.Punctuation.Colon,
+                    Token.Keywords.Modifiers.Out,
+                    Token.Variables.ReadWrite("y"),
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
             it("generic with no arguments", () => {
                 const input = Input.InMethod(`M<int>();`);
                 const tokens = tokenize(input);