Allow invocation expressions to have space before open parenthesis

Author: DustinCampbell

grammars/csharp.tmLanguage

@@ -425,11 +425,11 @@
           </dict>
           <dict>
             <key>include</key>
-            <string>#member-access-expression</string>
+            <string>#invocation-expression</string>
           </dict>
           <dict>
             <key>include</key>
-            <string>#invocation-expression</string>
+            <string>#member-access-expression</string>
           </dict>
           <dict>
             <key>include</key>

grammars/csharp.tmLanguage.cson

@@ -301,10 +301,10 @@ repository:
         include: "#anonymous-object-creation-expression"
       }
       {
-        include: "#member-access-expression"
+        include: "#invocation-expression"
       }
       {
-        include: "#invocation-expression"
+        include: "#member-access-expression"
       }
       {
         include: "#element-access-expression"

src/csharp.tmLanguage.yml

@@ -121,8 +121,8 @@ repository:
     - include: '#object-creation-expression'
     - include: '#array-creation-expression'
     - include: '#anonymous-object-creation-expression'
-    - include: '#member-access-expression'
     - include: '#invocation-expression'
+    - include: '#member-access-expression'
     - include: '#element-access-expression'
     - include: '#cast-expression'
     - include: '#literal'

test/expressions.tests.ts

@@ -1743,6 +1743,18 @@ long total = (data["bonusGame"]["win"].AsLong) * data["bonusGame"]["betMult"].As
                 ]);
             });
 
+            it("no arguments with space (issue #54)", () => {
+                const input = Input.InMethod(`M ();`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
             it("one argument", () => {
                 const input = Input.InMethod(`M(42);`);
                 const tokens = tokenize(input);
@@ -1756,6 +1768,19 @@ long total = (data["bonusGame"]["win"].AsLong) * data["bonusGame"]["betMult"].As
                 ]);
             });
 
+            it("one argument with space (issue #54)", () => {
+                const input = Input.InMethod(`M (42);`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Literals.Numeric.Decimal("42"),
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
             it("two arguments", () => {
                 const input = Input.InMethod(`M(19, 23);`);
                 const tokens = tokenize(input);
@@ -2000,6 +2025,36 @@ long total = (data["bonusGame"]["win"].AsLong) * data["bonusGame"]["betMult"].As
                 ]);
             });
 
+            it("qualified method with no arguments and space 1 (issue #54)", () => {
+                const input = Input.InMethod(`N.C.M ();`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Variables.Object("N"),
+                    Token.Punctuation.Accessor,
+                    Token.Variables.Property("C"),
+                    Token.Punctuation.Accessor,
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
+            it("qualified method with no arguments and space 2 (issue #54)", () => {
+                const input = Input.InMethod(`C.M ();`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Variables.Object("C"),
+                    Token.Punctuation.Accessor,
+                    Token.Identifiers.MethodName("M"),
+                    Token.Punctuation.OpenParen,
+                    Token.Punctuation.CloseParen,
+                    Token.Punctuation.Semicolon
+                ]);
+            });
+
             it("store result of this.qualified method with no arguments", () => {
                 const input = Input.InMethod(`var o = this.C.M();`);
                 const tokens = tokenize(input);