diff options
Diffstat (limited to 'node_modules/tslint/lib/language')
8 files changed, 19 insertions, 7 deletions
diff --git a/node_modules/tslint/lib/language/formatter/abstractFormatter.d.ts b/node_modules/tslint/lib/language/formatter/abstractFormatter.d.ts index 918f13803..db244af13 100644 --- a/node_modules/tslint/lib/language/formatter/abstractFormatter.d.ts +++ b/node_modules/tslint/lib/language/formatter/abstractFormatter.d.ts @@ -19,4 +19,5 @@ import { IFormatter, IFormatterMetadata } from "./formatter"; export declare abstract class AbstractFormatter implements IFormatter { static metadata: IFormatterMetadata; abstract format(failures: RuleFailure[]): string; + protected sortFailures(failures: RuleFailure[]): RuleFailure[]; } diff --git a/node_modules/tslint/lib/language/formatter/abstractFormatter.js b/node_modules/tslint/lib/language/formatter/abstractFormatter.js index 3306c7dc0..21ecc1064 100644 --- a/node_modules/tslint/lib/language/formatter/abstractFormatter.js +++ b/node_modules/tslint/lib/language/formatter/abstractFormatter.js @@ -16,9 +16,13 @@ * limitations under the License. */ Object.defineProperty(exports, "__esModule", { value: true }); +var rule_1 = require("../rule/rule"); var AbstractFormatter = /** @class */ (function () { function AbstractFormatter() { } + AbstractFormatter.prototype.sortFailures = function (failures) { + return failures.slice().sort(rule_1.RuleFailure.compare); + }; return AbstractFormatter; }()); exports.AbstractFormatter = AbstractFormatter; diff --git a/node_modules/tslint/lib/language/formatter/formatter.d.ts b/node_modules/tslint/lib/language/formatter/formatter.d.ts index 201054396..49eb20fbe 100644 --- a/node_modules/tslint/lib/language/formatter/formatter.d.ts +++ b/node_modules/tslint/lib/language/formatter/formatter.d.ts @@ -44,8 +44,8 @@ export interface FormatterConstructor { export interface IFormatter { /** * Formats linter results - * @param {RuleFailure[]} failures Linter failures that were not fixed - * @param {RuleFailure[]} fixes Fixed linter failures. Available when the `--fix` argument is used on the command line + * @param failures Linter failures that were not fixed + * @param fixes Fixed linter failures. Available when the `--fix` argument is used on the command line */ format(failures: RuleFailure[], fixes?: RuleFailure[]): string; } diff --git a/node_modules/tslint/lib/language/rule/rule.d.ts b/node_modules/tslint/lib/language/rule/rule.d.ts index 1004bdc6b..d1ba8ac58 100644 --- a/node_modules/tslint/lib/language/rule/rule.d.ts +++ b/node_modules/tslint/lib/language/rule/rule.d.ts @@ -161,6 +161,7 @@ export declare class RuleFailure { private endPosition; private rawLines; private ruleSeverity; + static compare(a: RuleFailure, b: RuleFailure): number; constructor(sourceFile: ts.SourceFile, start: number, end: number, failure: string, ruleName: string, fix?: Replacement | Replacement[] | undefined); getFileName(): string; getRuleName(): string; diff --git a/node_modules/tslint/lib/language/rule/rule.js b/node_modules/tslint/lib/language/rule/rule.js index 6feae5e96..d9c251842 100644 --- a/node_modules/tslint/lib/language/rule/rule.js +++ b/node_modules/tslint/lib/language/rule/rule.js @@ -112,6 +112,12 @@ var RuleFailure = /** @class */ (function () { this.rawLines = sourceFile.text; this.ruleSeverity = "error"; } + RuleFailure.compare = function (a, b) { + if (a.fileName !== b.fileName) { + return a.fileName < b.fileName ? -1 : 1; + } + return a.startPosition.getPosition() - b.startPosition.getPosition(); + }; RuleFailure.prototype.getFileName = function () { return this.fileName; }; diff --git a/node_modules/tslint/lib/language/utils.d.ts b/node_modules/tslint/lib/language/utils.d.ts index dc8cfc444..ffdd0aabc 100644 --- a/node_modules/tslint/lib/language/utils.d.ts +++ b/node_modules/tslint/lib/language/utils.d.ts @@ -23,7 +23,8 @@ export declare function childOfKind(node: ts.Node, kind: ts.SyntaxKind): ts.Node * @returns true if some ancestor of `node` satisfies `predicate`, including `node` itself. */ export declare function someAncestor(node: ts.Node, predicate: (n: ts.Node) => boolean): boolean; -export declare function ancestorWhere<T extends ts.Node>(node: ts.Node, predicate: (n: ts.Node) => boolean): ts.Node | undefined; +export declare function ancestorWhere<T extends ts.Node>(node: ts.Node, predicate: (n: ts.Node) => n is T): T | undefined; +export declare function ancestorWhere(node: ts.Node, predicate: (n: ts.Node) => boolean): ts.Node | undefined; export declare function isAssignment(node: ts.Node): boolean; /** * Bitwise check for node flags. diff --git a/node_modules/tslint/lib/language/utils.js b/node_modules/tslint/lib/language/utils.js index 30983ec6b..e9ba81a48 100644 --- a/node_modules/tslint/lib/language/utils.js +++ b/node_modules/tslint/lib/language/utils.js @@ -64,13 +64,13 @@ exports.isBlockScopedVariable = isBlockScopedVariable; function isBlockScopedBindingElement(node) { var variableDeclaration = getBindingElementVariableDeclaration(node); // if no variable declaration, it must be a function param, which is block scoped - return (variableDeclaration == null) || isBlockScopedVariable(variableDeclaration); + return (variableDeclaration === null) || isBlockScopedVariable(variableDeclaration); } exports.isBlockScopedBindingElement = isBlockScopedBindingElement; function getBindingElementVariableDeclaration(node) { var currentParent = node.parent; while (currentParent.kind !== ts.SyntaxKind.VariableDeclaration) { - if (currentParent.parent == null) { + if (currentParent.parent === undefined) { return null; // function parameter, no variable declaration } else { @@ -92,7 +92,7 @@ exports.childOfKind = childOfKind; * @returns true if some ancestor of `node` satisfies `predicate`, including `node` itself. */ function someAncestor(node, predicate) { - return predicate(node) || (node.parent != null && someAncestor(node.parent, predicate)); + return predicate(node) || (node.parent !== undefined && someAncestor(node.parent, predicate)); } exports.someAncestor = someAncestor; function ancestorWhere(node, predicate) { diff --git a/node_modules/tslint/lib/language/walker/blockScopeAwareRuleWalker.js b/node_modules/tslint/lib/language/walker/blockScopeAwareRuleWalker.js index 4adc42d04..0b270d2cb 100644 --- a/node_modules/tslint/lib/language/walker/blockScopeAwareRuleWalker.js +++ b/node_modules/tslint/lib/language/walker/blockScopeAwareRuleWalker.js @@ -19,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); var ts = require("typescript"); var utils_1 = require("../utils"); -// tslint:disable deprecation var scopeAwareRuleWalker_1 = require("./scopeAwareRuleWalker"); /** * @deprecated See comment on ScopeAwareRuleWalker. |