Use expectTokenIsOneOf

microsoft · Jun 1, 2022 · 124d36a · 124d36a
1 parent da3349a
commit 124d36a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/compiler/core/parser.ts b/packages/compiler/core/parser.ts
@@ -604,10 +604,13 @@ export function parse(code: string | SourceFile, options: ParseOptions = {}): Ca
     const id = parseIdentifier();
     const templateParameters = inInterface ? [] : parseTemplateParameterList();
 
+    // Make sure the next token is one that is expected
+    const token = expectTokenIsOneOf(Token.OpenParen, Token.Colon);
+
     // Check if we're parsing a declaration or reuse of another operation
     let signature: OperationSignature;
     const signaturePos = tokenPos();
-    if (token() === Token.OpenParen) {
+    if (token === Token.OpenParen) {
       const parameters = parseOperationParameters();
       parseExpected(Token.Colon);
       const returnType = parseExpression();

diff --git a/packages/compiler/test/checker/operations.ts b/packages/compiler/test/checker/operations.ts
@@ -150,7 +150,7 @@ describe("cadl: operations", () => {
     expectDiagnostics(diagnostics, [
       {
         code: "token-expected",
-        message: `':' expected.`,
+        message: `'(', or ':' expected.`,
       },
       {
         code: "token-expected",