Allow trailing semi-colon after typedef

src/main/parser.ts

@@ -536,6 +536,8 @@ export function createParser(
 
         const annotations: Annotations | undefined = parseAnnotations()
 
+        readListSeparator()
+
         return {
             type: SyntaxType.TypedefDefinition,
             name: createIdentifier(nameToken.text, nameToken.loc),

src/tests/parser/fixtures/trailing-semi-colon.thrift

@@ -0,0 +1,2 @@
+const string test = 'asdf';
+typedef i32 MyInteger;

src/tests/parser/parser.spec.ts

@@ -154,6 +154,19 @@ describe('Parser', () => {
         assert.deepEqual(objectify(thrift), expected)
     })
 
+    it('should correctly parse the consts and typedefs with trailing-comma', () => {
+        const content: string = loadSource('trailing-semi-colon')
+        const scanner: Scanner = createScanner(content)
+        const tokens: Array<Token> = scanner.scan()
+
+        const parser: Parser = createParser(tokens)
+        const thrift: ThriftDocument = parser.parse()
+
+        const expected: any = loadSolution('trailing-semi-colon')
+
+        assert.deepEqual(objectify(thrift), expected)
+    })
+
     it('should correctly parse the syntax of an exception', () => {
         const content: string = loadSource('exception')
         const scanner: Scanner = createScanner(content)

src/tests/parser/solutions/trailing-semi-colon.solution.json

@@ -0,0 +1,115 @@
+{
+    "type": "ThriftDocument",
+    "body": [
+        {
+            "type": "ConstDefinition",
+            "name": {
+                "type": "Identifier",
+                "value": "test",
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 14,
+                        "index": 13
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 18,
+                        "index": 17
+                    }
+                }
+            },
+            "fieldType": {
+                "type": "StringKeyword",
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 7,
+                        "index": 6
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 13,
+                        "index": 12
+                    }
+                }
+            },
+            "initializer": {
+                "type": "StringLiteral",
+                "value": "asdf",
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 21,
+                        "index": 20
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 27,
+                        "index": 26
+                    }
+                }
+            },
+            "comments": [],
+            "loc": {
+                "start": {
+                    "line": 1,
+                    "column": 1,
+                    "index": 0
+                },
+                "end": {
+                    "line": 1,
+                    "column": 27,
+                    "index": 26
+                }
+            }
+        },
+        {
+            "type": "TypedefDefinition",
+            "name": {
+                "type": "Identifier",
+                "value": "MyInteger",
+                "loc": {
+                    "start": {
+                        "line": 2,
+                        "column": 13,
+                        "index": 40
+                    },
+                    "end": {
+                        "line": 2,
+                        "column": 22,
+                        "index": 49
+                    }
+                }
+            },
+            "definitionType": {
+                "type": "I32Keyword",
+                "loc": {
+                    "start": {
+                        "line": 2,
+                        "column": 9,
+                        "index": 36
+                    },
+                    "end": {
+                        "line": 2,
+                        "column": 12,
+                        "index": 39
+                    }
+                }
+            },
+            "comments": [],
+            "loc": {
+                "start": {
+                    "line": 2,
+                    "column": 1,
+                    "index": 28
+                },
+                "end": {
+                    "line": 2,
+                    "column": 22,
+                    "index": 49
+                }
+            }
+        }
+    ]
+}

src/tests/scanner/fixtures/trailing-semi-colon.txt

@@ -0,0 +1,4 @@
+const string test = 'asdf';
+typedef i32 MyInteger;
+const string test = 'asdf'
+typedef i32 MyInteger

src/tests/scanner/scanner.spec.ts

@@ -151,6 +151,16 @@ describe('Scanner', () => {
         assert.deepEqual(tokens, expected)
     })
 
+    it('should allow trailing semicolon in const and typedef', () => {
+        const content = loadSource('trailing-semi-colon')
+        const scanner: Scanner = createScanner(content)
+        const tokens: Array<Token> = scanner.scan()
+
+        const expected: any = loadSolution('trailing-semi-colon')
+
+        assert.deepEqual(tokens, expected)
+    })
+
     it('should correctly handle assignment to a negative number', () => {
         const content = loadSource('const-number')
         const scanner: Scanner = createScanner(content)