OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix curly statement newlines rule when prefixed with newlines

Browse Source
This commit is contained in:
Asher 2019-02-05 16:15:50 -06:00
parent 70ad911641
commit dc08df5540
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rules/src/curlyStatementNewlinesRule.ts
View File

@ -5,8 +5,7 @@ import * as Lint from "tslint";
* Curly statement newlines rule. * Curly statement newlines rule.
*/ */
export class Rule extends Lint.Rules.AbstractRule { export class Rule extends Lint.Rules.AbstractRule {
public static FAILURE_STRING = "Curly statements must separate with newlines";
public static FAILURE_STRING = "curly statements must separate with newlines";
/** /**
* Apply the rule. * Apply the rule.
@ -14,24 +13,21 @@ export class Rule extends Lint.Rules.AbstractRule {
public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] { public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
return this.applyWithWalker(new CurlyStatementNewlinesWalker(sourceFile, this.getOptions())); return this.applyWithWalker(new CurlyStatementNewlinesWalker(sourceFile, this.getOptions()));
} }
} }
/** /**
* Curly statement newlines walker. * Curly statement newlines walker.
*/ */
class CurlyStatementNewlinesWalker extends Lint.RuleWalker { class CurlyStatementNewlinesWalker extends Lint.RuleWalker {
/** /**
* Visit if statements. * Visit if statements.
*/ */
public visitIfStatement(node: ts.IfStatement): void { public visitIfStatement(node: ts.IfStatement): void {
const splitLength = node.getFullText().split("\n").length; const splitLength = node.getFullText().trim().split("\n").length;
if (splitLength <= 2) { if (splitLength <= 2) {
this.addFailureAt(node.getStart(), node.getWidth(), Rule.FAILURE_STRING); this.addFailureAt(node.getStart(), node.getWidth(), Rule.FAILURE_STRING);
} }
super.visitIfStatement(node); super.visitIfStatement(node);
} }
} }