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

Update no-var-keyword to dissalow var in export statements (fixes #1256) #1471

Merged
merged 1 commit into from
Aug 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rules/noVarKeywordRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ export class Rule extends Lint.Rules.AbstractRule {

class NoVarKeywordWalker extends Lint.RuleWalker {
public visitVariableStatement(node: ts.VariableStatement) {
if (!Lint.hasModifier(node.modifiers, ts.SyntaxKind.ExportKeyword, ts.SyntaxKind.DeclareKeyword)
if (!Lint.hasModifier(node.modifiers, ts.SyntaxKind.DeclareKeyword)
&& !Lint.isBlockScopedVariable(node)) {
this.addFailure(this.createFailure(node.getStart(), "var".length, Rule.FAILURE_STRING));
this.addFailure(this.createFailure(node.declarationList.getStart(), "var".length, Rule.FAILURE_STRING));
}

super.visitVariableStatement(node);
Expand Down
22 changes: 18 additions & 4 deletions test/rules/no-var-keyword/test.ts.lint
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ for (var n1 in foo);
for (var n2 of foo);
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]

export var exportVar0 = 0;
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]
export var exportVar1 = 1;
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]
export var exportVar2 = 2,
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]
exportVar21 = 21;
export /* var tst */ var exportVar3 = 3;
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]

module quz {
export var i;
~~~ [Forbidden 'var' keyword, use 'let' or 'const' instead]
}

declare var tmp2: any;

let bar;
Expand All @@ -28,10 +43,6 @@ const qux;
let k,
l;

module quz {
export var i;
}

let [x, y] = [1, 2];

for (n; false;);
Expand All @@ -40,3 +51,6 @@ for (let name in foo);
for (let name of foo);
for (const name in foo);
for (const name of foo);

export let exportLet = 1;
export const exportConst = 1;