Skip to content
This repository has been archived by the owner on Mar 25, 2021. It is now read-only.

Reduce false positive rate in no-invalid-template-strings #3769

Merged
merged 1 commit into from Jul 18, 2018
Merged

Reduce false positive rate in no-invalid-template-strings #3769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/rules/noInvalidTemplateStringsRule.ts
View file
Open in desktop
Expand Up @@ -51,15 +51,14 @@ function walk(ctx: Lint.WalkContext<void>) {

function check(node: ts.StringLiteral): void {
const text = node.getText(ctx.sourceFile);
const findTemplateStrings = /\\*\$\{/g;
const findTemplateStrings = /(\\*)(\$\{.+?\})/g;
let instance = findTemplateStrings.exec(text);
while (instance !== null) {
const matchLength = instance[0].length;
const backslashCount = matchLength - 2;
const backslashCount = instance[1].length;
const instanceIsEscaped = backslashCount % 2 === 1;
if (!instanceIsEscaped) {
const start = node.getStart() + (instance.index + backslashCount);
ctx.addFailureAt(start, 2, Rule.FAILURE_STRING);
ctx.addFailureAt(start, instance[2].length, Rule.FAILURE_STRING);
}
instance = findTemplateStrings.exec(text);
}
Expand Down
28 changes: 18 additions & 10 deletions test/rules/no-invalid-template-strings/test.ts.lint
View file
Open in desktop
Expand Up @@ -3,31 +3,39 @@ new (Tab.mixins.Controlled('MemberComments',Tab.mixins.Templated('<div mbr-comme
new (Tab.mixins.Controlled('MemberComments',Tab.mixins.Templated('<div mbr-comment-tab=\${b}></div>',Tab.mixins.AlwaysHasData('\${c}'))))

Tab.mixins.Templated('<div mbr-comment-tab=\${which}></div>',Tab.mixins.AlwaysHasData('\\${d}'))
~~ [0]
~~~~ [0]

Tab.mixins.Templated(`<div mbr-comment-tab=\${e}></div>`,Tab.mixins.AlwaysHasData('${f}'))
~~ [0]
~~~~ [0]

Tab.mixins.Templated('<div mbr-comment-tab=${g}></div>',Tab.mixins.AlwaysHasData('${h}'), Tab.mixin.SomeMethod('${i}'))
~~ [0]
~~ [0]
~~ [0]
~~~~ [0]
~~~~ [0]
~~~~ [0]

new (Tab.mixins.Controlled('MemberComments',Tab.mixins.Templated('<div mbr-comment-tab=\\${j}></div>',Tab.mixins.AlwaysHasData())))
~~ [0]
~~~~ [0]

new (Tab.mixins.Templated('<div mbr-comment-tab=\\\\\${b}></div>',Tab.mixins.AlwaysHasData('\\\\${c}'))))
~~ [0]
~~~~ [0]

"\${a} = ${a}";
~~ [0]
~~~~ [0]

"One plus one is ${1 + 1}.";
~~ [0]
~~~~~~~~ [0]

'One plus one is ${1 + 1}.';
~~ [0]
~~~~~~~~ [0]

`One plus one is ${1 + 1}.`;

"${";

"${" + '}';

"${() => {}} ${abc}"
~~~~~~~~~~ [0]
~~~~~~ [0]

[0]: Interpolation will only work for template strings.