Add quotemark type validation to allow early return (#4310)

src/rules/quotemarkRule.ts

@@ -51,6 +51,10 @@ interface Options {
     avoidTemplate: boolean;
 }
 
+function isQuoteMark(value: string): value is QUOTEMARK {
+    return ["'", '"', "`"].indexOf(value) > -1;
+}
+
 export class Rule extends Lint.Rules.AbstractRule {
     /* tslint:disable:object-literal-sort-keys */
     public static metadata: Lint.IRuleMetadata = {
@@ -140,8 +144,8 @@ function walk(ctx: Lint.WalkContext<Options>) {
                 return;
             }
 
-            // We already have the expected quotemark. Done.
-            if (actualQuotemark === expectedQuotemark) {
+            // We already have the expected quotemark, or the quotemark is invalid. Done.
+            if (actualQuotemark === expectedQuotemark || !isQuoteMark(actualQuotemark)) {
                 return;
             }
 

test/rules/quotemark/invalid-double/test.ts.fix

@@ -0,0 +1,2 @@
+var single = "single";
+var unbalancedSingleAfter = ('a)

test/rules/quotemark/invalid-double/test.ts.lint

@@ -0,0 +1,3 @@
+var single = 'single';
+             ~~~~~~~~  [' should be "]
+var unbalancedSingleAfter = ('a)

test/rules/quotemark/invalid-double/tslint.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "quotemark": [true, "double"]
+  }
+}

test/rules/quotemark/invalid-single/test.ts.fix

@@ -0,0 +1,2 @@
+var single = 'single';
+var unbalancedSingleAfter = ("a)

test/rules/quotemark/invalid-single/test.ts.lint

@@ -0,0 +1,3 @@
+var single = "single";
+             ~~~~~~~~  [" should be ']
+var unbalancedSingleAfter = ("a)

test/rules/quotemark/invalid-single/tslint.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "quotemark": [true, "single"]
+  }
+}