From 239989ffd8a86f2ef6c6d649a2bae893d7119853 Mon Sep 17 00:00:00 2001
From: JordanBoltonMN <jordanboltonmn@gmail.com>
Date: Fri, 11 Dec 2020 13:05:26 -0800
Subject: [PATCH] initial commit

---
 src/powerquery-parser/common/stringUtils.ts |  4 +--
 src/test/libraryTest/common/stringUtils.ts  | 15 +++++++++
 src/test/libraryTest/parser/simple.ts       | 34 ++++++++++++++++-----
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/powerquery-parser/common/stringUtils.ts b/src/powerquery-parser/common/stringUtils.ts
index 36583557..931b7e20 100644
--- a/src/powerquery-parser/common/stringUtils.ts
+++ b/src/powerquery-parser/common/stringUtils.ts
@@ -168,7 +168,6 @@ export function maybeQuotedIdentifier(text: string, index: number): number | und
     const startingIndex: number = index;
     const textLength: number = text.length;
     let continueMatching: boolean = true;
-    let isValid: boolean = false;
     index += 2;
 
     while (continueMatching) {
@@ -179,7 +178,6 @@ export function maybeQuotedIdentifier(text: string, index: number): number | und
 
             if (chr2 !== '"') {
                 continueMatching = false;
-                isValid = true;
                 index += 1;
                 continue;
             } else {
@@ -194,7 +192,7 @@ export function maybeQuotedIdentifier(text: string, index: number): number | und
         }
     }
 
-    return isValid ? index - startingIndex : undefined;
+    return index !== startingIndex ? index - startingIndex : undefined;
 }
 
 export function maybeNewlineKindAt(text: string, index: number): NewlineKind | undefined {
diff --git a/src/test/libraryTest/common/stringUtils.ts b/src/test/libraryTest/common/stringUtils.ts
index 3dfac93e..08c52602 100644
--- a/src/test/libraryTest/common/stringUtils.ts
+++ b/src/test/libraryTest/common/stringUtils.ts
@@ -27,4 +27,19 @@ describe("StringUtils", () => {
             it("a..1", () => expect(StringUtils.isGeneralizedIdentifier("a..1"), "should be false").to.be.false);
         });
     });
+
+    describe(`isQuotedIdentifier`, () => {
+        describe(`valid`, () => {
+            it(`#"foo"`, () => expect(StringUtils.isQuotedIdentifier(`#"foo"`), "should be true").to.be.true);
+            it(`#""`, () => expect(StringUtils.isQuotedIdentifier(`#""`), "should be true").to.be.true);
+            it(`#""""`, () => expect(StringUtils.isQuotedIdentifier(`#""""`), "should be true").to.be.true);
+            it(`#"a""b""c"`, () => expect(StringUtils.isQuotedIdentifier(`#"a""b""c"`), "should be true").to.be.true);
+            it(`#"""b""c"`, () => expect(StringUtils.isQuotedIdentifier(`#"""b""c"`), "should be true").to.be.true);
+            it(`#"a""b"""`, () => expect(StringUtils.isQuotedIdentifier(`#"a""b"""`), "should be true").to.be.true);
+        });
+        describe(`invalid`, () => {
+            it(`#"`, () => expect(StringUtils.isGeneralizedIdentifier(`#"`), "should be false").to.be.false);
+            it(`""`, () => expect(StringUtils.isGeneralizedIdentifier(`""`), "should be false").to.be.false);
+        });
+    });
 });
diff --git a/src/test/libraryTest/parser/simple.ts b/src/test/libraryTest/parser/simple.ts
index 3448266c..4906c562 100644
--- a/src/test/libraryTest/parser/simple.ts
+++ b/src/test/libraryTest/parser/simple.ts
@@ -810,6 +810,22 @@ describe("Parser.AbridgedNode", () => {
             ];
             assertAbridgeNodes(text, expected);
         });
+
+        it(`[#"a""" = 1]`, () => {
+            const text: string = `[#"a""" = 1]`;
+            const expected: ReadonlyArray<AbridgedNode> = [
+                [Language.Ast.NodeKind.RecordExpression, undefined],
+                [Language.Ast.NodeKind.Constant, 0],
+                [Language.Ast.NodeKind.ArrayWrapper, 1],
+                [Language.Ast.NodeKind.Csv, 0],
+                [Language.Ast.NodeKind.GeneralizedIdentifierPairedExpression, 0],
+                [Language.Ast.NodeKind.GeneralizedIdentifier, 0],
+                [Language.Ast.NodeKind.Constant, 1],
+                [Language.Ast.NodeKind.LiteralExpression, 2],
+                [Language.Ast.NodeKind.Constant, 2],
+            ];
+            assertAbridgeNodes(text, expected);
+        });
     });
 
     it(`Ast.NodeKind.GeneralizedIdentifierPairedAnyLiteral`, () => {
@@ -850,14 +866,16 @@ describe("Parser.AbridgedNode", () => {
 
     // Ast.NodeKind.Identifier covered by many
 
-    it(`${Language.Ast.NodeKind.IdentifierExpression}`, () => {
-        const text: string = `@foo`;
-        const expected: ReadonlyArray<AbridgedNode> = [
-            [Language.Ast.NodeKind.IdentifierExpression, undefined],
-            [Language.Ast.NodeKind.Constant, 0],
-            [Language.Ast.NodeKind.Identifier, 1],
-        ];
-        assertAbridgeNodes(text, expected);
+    describe(`${Language.Ast.NodeKind.IdentifierExpression}`, () => {
+        it(`@foo`, () => {
+            const text: string = `@foo`;
+            const expected: ReadonlyArray<AbridgedNode> = [
+                [Language.Ast.NodeKind.IdentifierExpression, undefined],
+                [Language.Ast.NodeKind.Constant, 0],
+                [Language.Ast.NodeKind.Identifier, 1],
+            ];
+            assertAbridgeNodes(text, expected);
+        });
     });
 
     it(`${Language.Ast.NodeKind.IdentifierPairedExpression}`, () => {