Make many 'static' variables readonly (microsoft#17306)

Andy · web-flow · commit c60774b4c629 · 2017-07-20T08:54:47.000-07:00
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -130,7 +130,7 @@ namespace FourSlash {
         // 0 - cancelled
         // >0 - not cancelled
         // <0 - not cancelled and value denotes number of isCancellationRequested after which token become cancelled
-        private static NotCanceled: number = -1;
+        private static readonly NotCanceled: number = -1;
         private numberOfCallsBeforeCancellation: number = TestCancellationToken.NotCanceled;
 
         public isCancellationRequested(): boolean {
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -108,7 +108,7 @@ namespace Harness.LanguageService {
     }
 
     class DefaultHostCancellationToken implements ts.HostCancellationToken {
-        public static Instance = new DefaultHostCancellationToken();
+        public static readonly Instance = new DefaultHostCancellationToken();
 
         public isCancellationRequested() {
             return false;
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
@@ -238,10 +238,8 @@ namespace RWC {
 }
 
 class RWCRunner extends RunnerBase {
-    private static sourcePath = "internal/cases/rwc/";
-
     public enumerateTestFiles() {
-        return Harness.IO.listFiles(RWCRunner.sourcePath, /.+\.json$/);
+        return Harness.IO.listFiles("internal/cases/rwc/", /.+\.json$/);
     }
 
     public kind(): TestRunnerKind {
diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts
@@ -4,19 +4,19 @@
 /* tslint:disable:no-null-keyword */
 
 class Test262BaselineRunner extends RunnerBase {
-    private static basePath = "internal/cases/test262";
-    private static helpersFilePath = "tests/cases/test262-harness/helpers.d.ts";
-    private static helperFile: Harness.Compiler.TestFile = {
+    private static readonly basePath = "internal/cases/test262";
+    private static readonly helpersFilePath = "tests/cases/test262-harness/helpers.d.ts";
+    private static readonly helperFile: Harness.Compiler.TestFile = {
         unitName: Test262BaselineRunner.helpersFilePath,
         content: Harness.IO.readFile(Test262BaselineRunner.helpersFilePath),
     };
-    private static testFileExtensionRegex = /\.js$/;
-    private static options: ts.CompilerOptions = {
+    private static readonly testFileExtensionRegex = /\.js$/;
+    private static readonly options: ts.CompilerOptions = {
         allowNonTsExtensions: true,
         target: ts.ScriptTarget.Latest,
         module: ts.ModuleKind.CommonJS
     };
-    private static baselineOptions: Harness.Baseline.BaselineOptions = {
+    private static readonly baselineOptions: Harness.Baseline.BaselineOptions = {
         Subfolder: "test262",
         Baselinefolder: "internal/baselines"
     };
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1614,7 +1614,7 @@ namespace ts.server {
         }
 
         /** Makes a filename safe to insert in a RegExp */
-        private static filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
+        private static readonly filenameEscapeRegexp = /[-\/\\^$*+?.()|[\]{}]/g;
         private static escapeFilenameForRegex(filename: string) {
             return filename.replace(this.filenameEscapeRegexp, "\\$&");
         }
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -837,7 +837,7 @@ namespace ts.server {
      */
     export class InferredProject extends Project {
 
-        private static newName = (() => {
+        private static readonly newName = (() => {
             let nextId = 1;
             return () => {
                 const id = nextId;
diff --git a/src/services/formatting/ruleOperationContext.ts b/src/services/formatting/ruleOperationContext.ts
@@ -4,13 +4,13 @@
 namespace ts.formatting {
 
     export class RuleOperationContext {
-        private customContextChecks: { (context: FormattingContext): boolean; }[];
+        private readonly customContextChecks: { (context: FormattingContext): boolean; }[];
 
         constructor(...funcs: { (context: FormattingContext): boolean; }[]) {
             this.customContextChecks = funcs;
         }
 
-        static Any: RuleOperationContext = new RuleOperationContext();
+        static readonly Any: RuleOperationContext = new RuleOperationContext();
 
         public IsAny(): boolean {
             return this === RuleOperationContext.Any;

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace Harness.LanguageService {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`class DefaultHostCancellationToken implements ts.HostCancellationToken {`
`111`		`- public static Instance = new DefaultHostCancellationToken();`
	`111`	`+ public static readonly Instance = new DefaultHostCancellationToken();`
`112`	`112`
`113`	`113`	`public isCancellationRequested() {`
`114`	`114`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -238,10 +238,8 @@ namespace RWC {`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`class RWCRunner extends RunnerBase {`
`241`		`- private static sourcePath = "internal/cases/rwc/";`
`242`		`-`
`243`	`241`	`public enumerateTestFiles() {`
`244`		`- return Harness.IO.listFiles(RWCRunner.sourcePath, /.+\.json$/);`
	`242`	`+ return Harness.IO.listFiles("internal/cases/rwc/", /.+\.json$/);`
`245`	`243`	`}`
`246`	`244`
`247`	`245`	`public kind(): TestRunnerKind {`
Original file line number	Diff line number	Diff line change
`@@ -1614,7 +1614,7 @@ namespace ts.server {`
`1614`	`1614`	`}`
`1615`	`1615`
`1616`	`1616`	`/** Makes a filename safe to insert in a RegExp */`
`1617`		`- private static filenameEscapeRegexp = /[-\/\\^$*+?.()\|[\]{}]/g;`
	`1617`	`+ private static readonly filenameEscapeRegexp = /[-\/\\^$*+?.()\|[\]{}]/g;`
`1618`	`1618`	`private static escapeFilenameForRegex(filename: string) {`
`1619`	`1619`	`return filename.replace(this.filenameEscapeRegexp, "\\$&");`
`1620`	`1620`	`}`