Skip to content

Commit 9a1959f

Browse files
alexeaglealexeagle
committed
build(tslint): re-enable linter and fix violations
fixes angular#7798 Closes angular#7800
1 parent 226e662 commit 9a1959f

21 files changed

+118
-110
lines changed

‎modules/angular2/src/common/directives/ng_for.ts

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import {BaseException} from "../../facade/exceptions";
6969
export class NgFor implements DoCheck {
7070
/** @internal */
7171
_ngForOf: any;
72+
/** @internal */
7273
_ngForTrackBy: TrackByFn;
7374
private _differ: IterableDiffer;
7475

‎modules/angular2/src/common/directives/ng_plural.ts

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export abstract class NgLocalization { abstract getPluralCategory(value: any): s
7474

7575
@Directive({selector: '[ngPluralCase]'})
7676
export class NgPluralCase {
77+
/** @internal */
7778
_view: SwitchView;
7879
constructor(@Attribute('ngPluralCase') public value: string, template: TemplateRef,
7980
viewContainer: ViewContainerRef) {

‎modules/angular2/src/common/forms/directives/radio_control_value_accessor.ts

+3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,12 @@ export class RadioButtonState {
8888
})
8989
export class RadioControlValueAccessor implements ControlValueAccessor,
9090
OnDestroy, OnInit {
91+
/** @internal */
9192
_state: RadioButtonState;
93+
/** @internal */
9294
_control: NgControl;
9395
@Input() name: string;
96+
/** @internal */
9497
_fn: Function;
9598
onChange = () => {};
9699
onTouched = () => {};

‎modules/angular2/src/common/forms/directives/select_control_value_accessor.ts

+6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ function _extractId(valueString: string): string {
4444
})
4545
export class SelectControlValueAccessor implements ControlValueAccessor {
4646
value: any;
47+
/** @internal */
4748
_optionMap: Map<string, any> = new Map<string, any>();
49+
/** @internal */
4850
_idCounter: number = 0;
4951

5052
onChange = (_: any) => {};
@@ -63,15 +65,18 @@ export class SelectControlValueAccessor implements ControlValueAccessor {
6365
}
6466
registerOnTouched(fn: () => any): void { this.onTouched = fn; }
6567

68+
/** @internal */
6669
_registerOption(): string { return (this._idCounter++).toString(); }
6770

71+
/** @internal */
6872
_getOptionId(value: any): string {
6973
for (let id of MapWrapper.keys(this._optionMap)) {
7074
if (looseIdentical(this._optionMap.get(id), value)) return id;
7175
}
7276
return null;
7377
}
7478

79+
/** @internal */
7580
_getOptionValue(valueString: string): any {
7681
let value = this._optionMap.get(_extractId(valueString));
7782
return isPresent(value) ? value : valueString;
@@ -113,6 +118,7 @@ export class NgSelectOption implements OnDestroy {
113118
this._select.writeValue(this._select.value);
114119
}
115120

121+
/** @internal */
116122
_setElementValue(value: string): void {
117123
this._renderer.setElementProperty(this._element.nativeElement, 'value', value);
118124
}

‎modules/angular2/src/compiler/css/lexer.ts

+29-24
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,14 @@ export class LexedCssResult {
9494
constructor(public error: CssScannerError, public token: CssToken) {}
9595
}
9696

97-
export function generateErrorMessage(input, message, errorValue, index, row, column) {
97+
export function generateErrorMessage(input: string, message: string, errorValue: string,
98+
index: number, row: number, column: number): string {
9899
return `${message} at column ${row}:${column} in expression [` +
99100
findProblemCode(input, errorValue, index, column) + ']';
100101
}
101102

102-
export function findProblemCode(input, errorValue, index, column) {
103+
export function findProblemCode(input: string, errorValue: string, index: number,
104+
column: number): string {
103105
var endOfProblemLine = index;
104106
var current = charCode(input, index);
105107
while (current > 0 && !isNewline(current)) {
@@ -163,7 +165,9 @@ export class CssScanner {
163165
column: number = -1;
164166
line: number = 0;
165167

168+
/** @internal */
166169
_currentMode: CssLexerMode = CssLexerMode.BLOCK;
170+
/** @internal */
167171
_currentError: CssScannerError = null;
168172

169173
constructor(public input: string, private _trackComments: boolean = false) {
@@ -196,7 +200,7 @@ export class CssScanner {
196200
this.peekPeek = this.peekAt(this.index + 1);
197201
}
198202

199-
peekAt(index): number {
203+
peekAt(index: number): number {
200204
return index >= this.length ? $EOF : StringWrapper.charCodeAt(this.input, index);
201205
}
202206

@@ -295,6 +299,7 @@ export class CssScanner {
295299
return new LexedCssResult(error, token);
296300
}
297301

302+
/** @internal */
298303
_scan(): CssToken {
299304
var peek = this.peek;
300305
var peekPeek = this.peekPeek;
@@ -348,7 +353,7 @@ export class CssScanner {
348353
return this.error(`Unexpected character [${StringWrapper.fromCharCode(peek)}]`);
349354
}
350355

351-
scanComment() {
356+
scanComment(): CssToken {
352357
if (this.assertCondition(isCommentStart(this.peek, this.peekPeek),
353358
"Expected comment start value")) {
354359
return null;
@@ -375,7 +380,7 @@ export class CssScanner {
375380
return new CssToken(start, startingColumn, startingLine, CssTokenType.Comment, str);
376381
}
377382

378-
scanWhitespace() {
383+
scanWhitespace(): CssToken {
379384
var start = this.index;
380385
var startingColumn = this.column;
381386
var startingLine = this.line;
@@ -386,7 +391,7 @@ export class CssScanner {
386391
return new CssToken(start, startingColumn, startingLine, CssTokenType.Whitespace, str);
387392
}
388393

389-
scanString() {
394+
scanString(): CssToken {
390395
if (this.assertCondition(isStringStart(this.peek, this.peekPeek),
391396
"Unexpected non-string starting value")) {
392397
return null;
@@ -416,7 +421,7 @@ export class CssScanner {
416421
return new CssToken(start, startingColumn, startingLine, CssTokenType.String, str);
417422
}
418423

419-
scanNumber() {
424+
scanNumber(): CssToken {
420425
var start = this.index;
421426
var startingColumn = this.column;
422427
if (this.peek == $PLUS || this.peek == $MINUS) {
@@ -436,7 +441,7 @@ export class CssScanner {
436441
return new CssToken(start, startingColumn, this.line, CssTokenType.Number, strValue);
437442
}
438443

439-
scanIdentifier() {
444+
scanIdentifier(): CssToken {
440445
if (this.assertCondition(isIdentifierStart(this.peek, this.peekPeek),
441446
'Expected identifier starting value')) {
442447
return null;
@@ -451,7 +456,7 @@ export class CssScanner {
451456
return new CssToken(start, startingColumn, this.line, CssTokenType.Identifier, strValue);
452457
}
453458

454-
scanCssValueFunction() {
459+
scanCssValueFunction(): CssToken {
455460
var start = this.index;
456461
var startingColumn = this.column;
457462
while (this.peek != $EOF && this.peek != $RPAREN) {
@@ -461,7 +466,7 @@ export class CssScanner {
461466
return new CssToken(start, startingColumn, this.line, CssTokenType.Identifier, strValue);
462467
}
463468

464-
scanCharacter() {
469+
scanCharacter(): CssToken {
465470
var start = this.index;
466471
var startingColumn = this.column;
467472
if (this.assertCondition(isValidCssCharacter(this.peek, this._currentMode),
@@ -475,7 +480,7 @@ export class CssScanner {
475480
return new CssToken(start, startingColumn, this.line, CssTokenType.Character, c);
476481
}
477482

478-
scanAtExpression() {
483+
scanAtExpression(): CssToken {
479484
if (this.assertCondition(this.peek == $AT, 'Expected @ value')) {
480485
return null;
481486
}
@@ -521,19 +526,19 @@ function isAtKeyword(current: CssToken, next: CssToken): boolean {
521526
return current.numValue == $AT && next.type == CssTokenType.Identifier;
522527
}
523528

524-
function isCharMatch(target: number, previous: number, code: number) {
529+
function isCharMatch(target: number, previous: number, code: number): boolean {
525530
return code == target && previous != $BACKSLASH;
526531
}
527532

528533
function isDigit(code: number): boolean {
529534
return $0 <= code && code <= $9;
530535
}
531536

532-
function isCommentStart(code: number, next: number) {
537+
function isCommentStart(code: number, next: number): boolean {
533538
return code == $SLASH && next == $STAR;
534539
}
535540

536-
function isCommentEnd(code: number, next: number) {
541+
function isCommentEnd(code: number, next: number): boolean {
537542
return code == $STAR && next == $SLASH;
538543
}
539544

@@ -555,12 +560,12 @@ function isIdentifierStart(code: number, next: number): boolean {
555560
target == $MINUS || target == $_;
556561
}
557562

558-
function isIdentifierPart(target: number) {
563+
function isIdentifierPart(target: number): boolean {
559564
return ($a <= target && target <= $z) || ($A <= target && target <= $Z) || target == $BACKSLASH ||
560565
target == $MINUS || target == $_ || isDigit(target);
561566
}
562567

563-
function isValidPseudoSelectorCharacter(code: number) {
568+
function isValidPseudoSelectorCharacter(code: number): boolean {
564569
switch (code) {
565570
case $LPAREN:
566571
case $RPAREN:
@@ -570,11 +575,11 @@ function isValidPseudoSelectorCharacter(code: number) {
570575
}
571576
}
572577

573-
function isValidKeyframeBlockCharacter(code: number) {
578+
function isValidKeyframeBlockCharacter(code: number): boolean {
574579
return code == $PERCENT;
575580
}
576581

577-
function isValidAttributeSelectorCharacter(code: number) {
582+
function isValidAttributeSelectorCharacter(code: number): boolean {
578583
// value^*|$~=something
579584
switch (code) {
580585
case $$:
@@ -589,7 +594,7 @@ function isValidAttributeSelectorCharacter(code: number) {
589594
}
590595
}
591596

592-
function isValidSelectorCharacter(code: number) {
597+
function isValidSelectorCharacter(code: number): boolean {
593598
// selector [ key = value ]
594599
// IDENT C IDENT C IDENT C
595600
// #id, .class, *+~>
@@ -610,7 +615,7 @@ function isValidSelectorCharacter(code: number) {
610615
}
611616
}
612617

613-
function isValidStyleBlockCharacter(code: number) {
618+
function isValidStyleBlockCharacter(code: number): boolean {
614619
// key:value;
615620
// key:calc(something ... )
616621
switch (code) {
@@ -630,7 +635,7 @@ function isValidStyleBlockCharacter(code: number) {
630635
}
631636
}
632637

633-
function isValidMediaQueryRuleCharacter(code: number) {
638+
function isValidMediaQueryRuleCharacter(code: number): boolean {
634639
// (min-width: 7.5em) and (orientation: landscape)
635640
switch (code) {
636641
case $LPAREN:
@@ -644,7 +649,7 @@ function isValidMediaQueryRuleCharacter(code: number) {
644649
}
645650
}
646651

647-
function isValidAtRuleCharacter(code: number) {
652+
function isValidAtRuleCharacter(code: number): boolean {
648653
// @document url(http://www.w3.org/page?something=on#hash),
649654
switch (code) {
650655
case $LPAREN:
@@ -668,7 +673,7 @@ function isValidAtRuleCharacter(code: number) {
668673
}
669674
}
670675

671-
function isValidStyleFunctionCharacter(code: number) {
676+
function isValidStyleFunctionCharacter(code: number): boolean {
672677
switch (code) {
673678
case $PERIOD:
674679
case $MINUS:
@@ -684,7 +689,7 @@ function isValidStyleFunctionCharacter(code: number) {
684689
}
685690
}
686691

687-
function isValidBlockCharacter(code: number) {
692+
function isValidBlockCharacter(code: number): boolean {
688693
// @something { }
689694
// IDENT
690695
return code == $AT;

0 commit comments

Comments
 (0)