Merge pull request microsoft#13072 from DanCorder/fix12218

DanielRosenwasser · web-flow · commit 6c60bfc4f020 · 2016-12-20T16:10:16.000-08:00
Fix formatting for 'readonly' properties and linter error
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -318,7 +318,7 @@ namespace ts {
         if (traceEnabled) {
             trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
         }
-        let perFolderCache = cache && cache.getOrCreateCacheForDirectory(getDirectoryPath(containingFile));
+        const perFolderCache = cache && cache.getOrCreateCacheForDirectory(getDirectoryPath(containingFile));
         let result = perFolderCache && perFolderCache[moduleName];
 
         if (result) {
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
@@ -358,7 +358,7 @@ namespace ts.formatting {
             this.NoSpaceAfterModuleImport = new Rule(RuleDescriptor.create2(Shared.TokenRange.FromTokens([SyntaxKind.ModuleKeyword, SyntaxKind.RequireKeyword]), SyntaxKind.OpenParenToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // Add a space around certain TypeScript keywords
-            this.SpaceAfterCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.AbstractKeyword, SyntaxKind.ClassKeyword, SyntaxKind.DeclareKeyword, SyntaxKind.DefaultKeyword, SyntaxKind.EnumKeyword, SyntaxKind.ExportKeyword, SyntaxKind.ExtendsKeyword, SyntaxKind.GetKeyword, SyntaxKind.ImplementsKeyword, SyntaxKind.ImportKeyword, SyntaxKind.InterfaceKeyword, SyntaxKind.ModuleKeyword, SyntaxKind.NamespaceKeyword, SyntaxKind.PrivateKeyword, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.SetKeyword, SyntaxKind.StaticKeyword, SyntaxKind.TypeKeyword, SyntaxKind.FromKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
+            this.SpaceAfterCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.FromTokens([SyntaxKind.AbstractKeyword, SyntaxKind.ClassKeyword, SyntaxKind.DeclareKeyword, SyntaxKind.DefaultKeyword, SyntaxKind.EnumKeyword, SyntaxKind.ExportKeyword, SyntaxKind.ExtendsKeyword, SyntaxKind.GetKeyword, SyntaxKind.ImplementsKeyword, SyntaxKind.ImportKeyword, SyntaxKind.InterfaceKeyword, SyntaxKind.ModuleKeyword, SyntaxKind.NamespaceKeyword, SyntaxKind.PrivateKeyword, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.ReadonlyKeyword, SyntaxKind.SetKeyword, SyntaxKind.StaticKeyword, SyntaxKind.TypeKeyword, SyntaxKind.FromKeyword]), Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
             this.SpaceBeforeCertainTypeScriptKeywords = new Rule(RuleDescriptor.create4(Shared.TokenRange.Any, Shared.TokenRange.FromTokens([SyntaxKind.ExtendsKeyword, SyntaxKind.ImplementsKeyword, SyntaxKind.FromKeyword])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
diff --git a/tests/cases/fourslash/formattingReadonly.ts b/tests/cases/fourslash/formattingReadonly.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////  readonly    property1 {};/*1*/
+////  public readonly   property2 {};/*2*/
+////}
+
+format.document();
+goTo.marker("1");
+verify.currentLineContentIs("    readonly property1 {};");
+goTo.marker("2");
+verify.currentLineContentIs("    public readonly property2 {};");

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ namespace ts {`
`318`	`318`	`if (traceEnabled) {`
`319`	`319`	`trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);`
`320`	`320`	`}`
`321`		`- let perFolderCache = cache && cache.getOrCreateCacheForDirectory(getDirectoryPath(containingFile));`
	`321`	`+ const perFolderCache = cache && cache.getOrCreateCacheForDirectory(getDirectoryPath(containingFile));`
`322`	`322`	`let result = perFolderCache && perFolderCache[moduleName];`
`323`	`323`
`324`	`324`	`if (result) {`