Changes from CR feedback

microsoft · May 23, 2017 · 3b9ef4e · 3b9ef4e
1 parent dcab328
commit 3b9ef4e
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 146 deletions.
diff --git a/src/services/formatting/ruleOperationContext.ts b/src/services/formatting/ruleOperationContext.ts
@@ -4,27 +4,19 @@
 namespace ts.formatting {
 
     export class RuleOperationContext {
-        constructor(private optionName: string, private checkApplyRuleOperation: { (optionName: string, options: FormatCodeSettings): boolean }, private customContextChecks: { (context: FormattingContext): boolean; }[]) {
-        }
-
-        static Any: RuleOperationContext = new RuleOperationContext(undefined, undefined, []);
+        private customContextChecks: { (context: FormattingContext): boolean; }[];
 
-        static Create1(...funcs: { (context: FormattingContext): boolean; }[]) {
-            return new RuleOperationContext(undefined, undefined, funcs);
-        }
-        static Create2(optionName: string, checkApplyRuleOperation: { (optionName: string, options: FormatCodeSettings): boolean }, ...funcs: { (context: FormattingContext): boolean; }[]) {
-            return new RuleOperationContext(optionName, checkApplyRuleOperation, funcs);
+        constructor(...funcs: { (context: FormattingContext): boolean; }[]) {
+            this.customContextChecks = funcs;
         }
 
+        static Any: RuleOperationContext = new RuleOperationContext();
+
         public IsAny(): boolean {
             return this === RuleOperationContext.Any;
         }
 
         public InContext(context: FormattingContext): boolean {
-            if (this.checkApplyRuleOperation && !this.checkApplyRuleOperation(this.optionName, context.options)) {
-                return false;
-            }
-
             if (this.IsAny()) {
                 return true;
             }