From c60774b4c629c4d38e3e24b8e08edfccdde8e576 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 20 Jul 2017 08:54:47 -0700
Subject: [PATCH] Make many 'static' variables readonly (#17306)

---
 src/harness/fourslash.ts                        |  2 +-
 src/harness/harnessLanguageService.ts           |  2 +-
 src/harness/rwcRunner.ts                        |  4 +---
 src/harness/test262Runner.ts                    | 12 ++++++------
 src/server/editorServices.ts                    |  2 +-
 src/server/project.ts                           |  2 +-
 src/services/formatting/ruleOperationContext.ts |  4 ++--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 5e83c5339c6..d32bf92b007 100644
--- 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
index 156a9e08dce..c604b224656 100644
--- 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
index 1b7d54595e0..a25a0181511 100644
--- 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
index 939a02c7634..6c5b186f2b8 100644
--- 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
index 4a7fe91d450..2633de1b266 100644
--- 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
index 3b09fc48e85..106089fad97 100644
--- 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
index 6a19e23d57d..bf96363ad7d 100644
--- 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;