fix: #366 - Should be able to add a question token to a node without …

…a type.
dsherret · Jul 17, 2018 · c43c1e7 · c43c1e7
1 parent 3daae87
commit c43c1e7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/compiler/base/QuestionTokenableNode.ts b/src/compiler/base/QuestionTokenableNode.ts
@@ -54,9 +54,8 @@ export function QuestionTokenableNode<T extends Constructor<QuestionTokenableNod
                 if (TypeGuards.isExclamationTokenableNode(this))
                     this.setHasExclamationToken(false);
 
-                const colonNode = this.getFirstChildByKindOrThrow(SyntaxKind.ColonToken);
                 insertIntoParentTextRange({
-                    insertPos: colonNode.getStart(),
+                    insertPos: getInsertPos.call(this),
                     parent: this,
                     newText: "?"
                 });
@@ -65,6 +64,18 @@ export function QuestionTokenableNode<T extends Constructor<QuestionTokenableNod
                 removeChildren({ children: [questionTokenNode!] });
 
             return this;
+
+            function getInsertPos(this: QuestionTokenableNode & Node) {
+                const colonNode = this.getFirstChildByKind(SyntaxKind.ColonToken);
+                if (colonNode != null)
+                    return colonNode.getStart();
+
+                const semicolonToken = this.getLastChildByKind(SyntaxKind.SemicolonToken);
+                if (semicolonToken != null)
+                    return semicolonToken.getStart();
+
+                return this.getEnd();
+            }
         }
 
         fill(structure: Partial<QuestionTokenableNodeStructure>) {

diff --git a/src/tests/compiler/base/questionTokenableNodeTests.ts b/src/tests/compiler/base/questionTokenableNodeTests.ts
@@ -1,7 +1,9 @@
 import { expect } from "chai";
-import { ClassDeclaration, PropertyDeclaration, QuestionTokenableNode } from "../../../compiler";
+import { ParameterDeclaration, ClassDeclaration, PropertyDeclaration, QuestionTokenableNode } from "../../../compiler";
+import * as errors from "../../../errors";
+import { SyntaxKind } from "../../../typescript";
 import { QuestionTokenableNodeStructure } from "../../../structures";
-import { getInfoFromText } from "../testHelpers";
+import { getInfoFromText, getInfoFromTextWithDescendant } from "../testHelpers";
 
 describe(nameof(QuestionTokenableNode), () => {
     function getInfoWithFirstPropertyFromText(text: string) {
@@ -70,6 +72,14 @@ describe(nameof(QuestionTokenableNode), () => {
         it("should do nothing when setting to same value", () => {
             doTest("class MyClass { prop: string; }", false, "class MyClass { prop: string; }");
         });
+
+        it("should be set as optional when has no type and has a semi-colon", () => {
+            doTest("class MyClass { prop; }", true, "class MyClass { prop?; }");
+        });
+
+        it("should be set as optional when has no type nor semi-colon", () => {
+            doTest("class MyClass { prop }", true, "class MyClass { prop? }");
+        });
     });
 
     describe(nameof<PropertyDeclaration>(p => p.fill), () => {

diff --git a/src/tests/compiler/testHelpers/getInfoFromText.ts b/src/tests/compiler/testHelpers/getInfoFromText.ts
@@ -55,6 +55,7 @@ export function getInfoFromText<TFirstChild extends Node>(text: string, opts?: G
     };
 }
 
+// todo: use the mapping between syntax kind and nodes for the descendant
 export function getInfoFromTextWithDescendant<TDescendant extends Node>(text: string, descendantKind: SyntaxKind, opts?: GetInfoFromTextOptions) {
     const info = getInfoFromTextInternal(text, opts);
     return {