Merge pull request microsoft#8823 from Microsoft/no_null

Andy · Andy · commit 1abc2a784603 · 2016-05-25T12:23:37.000-07:00
Remove uses of `null` in services
diff --git a/src/services/formatting/ruleOperation.ts b/src/services/formatting/ruleOperation.ts
@@ -1,16 +1,9 @@
 ///<reference path='references.ts' />
-/* tslint:disable:no-null-keyword */
 
 /* @internal */
 namespace ts.formatting {
     export class RuleOperation {
-        public Context: RuleOperationContext;
-        public Action: RuleAction;
-
-        constructor() {
-            this.Context = null;
-            this.Action = null;
-        }
+        constructor(public Context: RuleOperationContext, public Action: RuleAction) {}
 
         public toString(): string {
             return "[context=" + this.Context + "," +
@@ -22,10 +15,7 @@ namespace ts.formatting {
         }
 
         static create2(context: RuleOperationContext, action: RuleAction) {
-            const result = new RuleOperation();
-            result.Context = context;
-            result.Action = action;
-            return result;
+            return new RuleOperation(context, action);
         }
     }
 }
diff --git a/src/services/formatting/rulesMap.ts b/src/services/formatting/rulesMap.ts
@@ -1,5 +1,4 @@
 ///<reference path='references.ts' />
-/* tslint:disable:no-null-keyword */
 
 /* @internal */
 namespace ts.formatting {
@@ -62,14 +61,14 @@ namespace ts.formatting {
         public GetRule(context: FormattingContext): Rule {
             const bucketIndex = this.GetRuleBucketIndex(context.currentTokenSpan.kind, context.nextTokenSpan.kind);
             const bucket = this.map[bucketIndex];
-            if (bucket != null) {
+            if (bucket) {
                 for (const rule of bucket.Rules()) {
                     if (rule.Operation.Context.InContext(context)) {
                         return rule;
                     }
                 }
             }
-            return null;
+            return undefined;
         }
     }
 
diff --git a/src/services/formatting/rulesProvider.ts b/src/services/formatting/rulesProvider.ts
@@ -1,5 +1,4 @@
 /// <reference path="references.ts"/>
-/* tslint:disable:no-null-keyword */
 
 /* @internal */
 namespace ts.formatting {
@@ -26,8 +25,7 @@ namespace ts.formatting {
         }
 
         public ensureUpToDate(options: ts.FormatCodeOptions) {
-            // TODO: Should this be '==='?
-            if (this.options == null || !ts.compareDataObjects(this.options, options)) {
+            if (!this.options || !ts.compareDataObjects(this.options, options)) {
                 const activeRules = this.createActiveRules(options);
                 const rulesMap = RulesMap.create(activeRules);
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`///<reference path='references.ts' />`
`2`		`-/* tslint:disable:no-null-keyword */`
`3`	`2`
`4`	`3`	`/* @internal */`
`5`	`4`	`namespace ts.formatting {`
`@@ -62,14 +61,14 @@ namespace ts.formatting {`
`62`	`61`	`public GetRule(context: FormattingContext): Rule {`
`63`	`62`	`const bucketIndex = this.GetRuleBucketIndex(context.currentTokenSpan.kind, context.nextTokenSpan.kind);`
`64`	`63`	`const bucket = this.map[bucketIndex];`
`65`		`- if (bucket != null) {`
	`64`	`+ if (bucket) {`
`66`	`65`	`for (const rule of bucket.Rules()) {`
`67`	`66`	`if (rule.Operation.Context.InContext(context)) {`
`68`	`67`	`return rule;`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`	`}`
`72`		`- return null;`
	`71`	`+ return undefined;`
`73`	`72`	`}`
`74`	`73`	`}`
`75`	`74`