removed TypeLibApi ctor parameter

retailcoder · retailcoder · commit 3a8d2f7c1572 · 2018-06-03T21:47:31.000-04:00
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs b/Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs
@@ -8,25 +8,24 @@ namespace Rubberduck.AutoComplete
 {
     public abstract class AutoCompleteBlockBase : AutoCompleteBase
     {
-        /// <param name="api">Used for ensuring compilable resulting code.</param>
         /// <param name="indenterSettings">Used for auto-indenting blocks as per indenter settings.</param>
         /// <param name="inputToken">The token that starts the block, i.e. what to detect.</param>
         /// <param name="outputToken">The token that closes the block, i.e. what to insert.</param>
-        protected AutoCompleteBlockBase(IVBETypeLibsAPI api, IIndenterSettings indenterSettings, string inputToken, string outputToken)
+        protected AutoCompleteBlockBase(IIndenterSettings indenterSettings, string inputToken, string outputToken)
             :base(inputToken, outputToken)
         {
-            _api = api;
-            _indenterSettings = indenterSettings;
+            IndenterSettings = indenterSettings;
         }
 
         protected virtual bool FindInputTokenAtBeginningOfCurrentLine => false;
 
-        private readonly IVBETypeLibsAPI _api;
-        private readonly IIndenterSettings _indenterSettings;
+        protected readonly IIndenterSettings IndenterSettings;
 
         protected virtual bool ExecuteOnCommittedInputOnly => true;
         protected virtual bool MatchInputTokenAtEndOfLineOnly => false;
 
+        protected virtual bool IndentBody => true;
+
         private bool _executing;
         public override bool Execute(AutoCompleteEventArgs e)
         {
@@ -36,7 +35,7 @@ public override bool Execute(AutoCompleteEventArgs e)
             }
 
             var selection = e.CodePane.Selection;
-            var stdIndent = _indenterSettings.IndentSpaces;
+            var stdIndent = IndentBody ? IndenterSettings.IndentSpaces : 0;
 
             var isMatch = MatchInputTokenAtEndOfLineOnly 
                             ? e.OldCode.EndsWith(InputToken)
@@ -59,6 +58,7 @@ public override bool Execute(AutoCompleteEventArgs e)
 
                     module.ReplaceLine(selection.StartLine, new string(' ', indent + stdIndent));
                     e.CodePane.Selection = new VBEditor.Selection(selection.StartLine, indent + stdIndent + 1);
+
                     e.NewCode = e.OldCode;
                     _executing = false;
                     return true;
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteDoBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteDoBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteDoBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteDoBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.Do}", Tokens.Loop) { }
+        public AutoCompleteDoBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.Do}", Tokens.Loop) { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteEnumBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteEnumBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteEnumBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteEnumBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.Enum}", $"{Tokens.End} {Tokens.Enum}") { }
+        public AutoCompleteEnumBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.Enum}", $"{Tokens.End} {Tokens.Enum}") { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteForBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteForBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteForBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteForBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings) 
-            : base(api, indenterSettings, $"{Tokens.For}", Tokens.Next) { }
+        public AutoCompleteForBlock(IIndenterSettings indenterSettings) 
+            : base(indenterSettings, $"{Tokens.For}", Tokens.Next) { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteIfBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteIfBlock.cs
@@ -1,14 +1,12 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
-using Rubberduck.VBEditor.Events;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteIfBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteIfBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings) 
-            : base(api, indenterSettings, $"{Tokens.Then}", $"{Tokens.End} {Tokens.If}") { }
+        public AutoCompleteIfBlock(IIndenterSettings indenterSettings) 
+            : base(indenterSettings, $"{Tokens.Then}", $"{Tokens.End} {Tokens.If}") { }
 
         protected override bool MatchInputTokenAtEndOfLineOnly => true;
     }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteOnErrorResumeNextBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteOnErrorResumeNextBlock.cs
@@ -1,13 +1,12 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteOnErrorResumeNextBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteOnErrorResumeNextBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0") { }
+        public AutoCompleteOnErrorResumeNextBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0") { }
 
         protected override bool ExecuteOnCommittedInputOnly => false;
     }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteSelectBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteSelectBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteSelectBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteSelectBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.Select} {Tokens.Case}", $"{Tokens.End} {Tokens.Select}") { }
+        public AutoCompleteSelectBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.Select} {Tokens.Case}", $"{Tokens.End} {Tokens.Select}") { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteTypeBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteTypeBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteTypeBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteTypeBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.Type}", $"{Tokens.End} {Tokens.Type}") { }
+        public AutoCompleteTypeBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.Type}", $"{Tokens.End} {Tokens.Type}") { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteWhileBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteWhileBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteWhileBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteWhileBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.While}", Tokens.Wend) { }
+        public AutoCompleteWhileBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.While}", Tokens.Wend) { }
     }
 }
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteWithBlock.cs b/Rubberduck.Core/AutoComplete/AutoCompleteWithBlock.cs
@@ -1,12 +1,11 @@
 ﻿using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteWithBlock : AutoCompleteBlockBase
     {
-        public AutoCompleteWithBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.With}", $"{Tokens.End} {Tokens.With}") { }
+        public AutoCompleteWithBlock(IIndenterSettings indenterSettings)
+            : base(indenterSettings, $"{Tokens.With}", $"{Tokens.End} {Tokens.With}") { }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`using Rubberduck.Parsing.Grammar;`
`2`	`2`	`using Rubberduck.SmartIndenter;`
`3`		`-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;`
`4`	`3`
`5`	`4`	`namespace Rubberduck.AutoComplete`
`6`	`5`	`{`
`7`	`6`	`public class AutoCompleteDoBlock : AutoCompleteBlockBase`
`8`	`7`	`{`
`9`		`- public AutoCompleteDoBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)`
`10`		`- : base(api, indenterSettings, $"{Tokens.Do}", Tokens.Loop) { }`
	`8`	`+ public AutoCompleteDoBlock(IIndenterSettings indenterSettings)`
	`9`	`+ : base(indenterSettings, $"{Tokens.Do}", Tokens.Loop) { }`
`11`	`10`	`}`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,12 @@`
`1`	`1`	`using Rubberduck.Parsing.Grammar;`
`2`	`2`	`using Rubberduck.SmartIndenter;`
`3`		`-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;`
`4`		`-using Rubberduck.VBEditor.Events;`
`5`	`3`
`6`	`4`	`namespace Rubberduck.AutoComplete`
`7`	`5`	`{`
`8`	`6`	`public class AutoCompleteIfBlock : AutoCompleteBlockBase`
`9`	`7`	`{`
`10`		`- public AutoCompleteIfBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)`
`11`		`- : base(api, indenterSettings, $"{Tokens.Then}", $"{Tokens.End} {Tokens.If}") { }`
	`8`	`+ public AutoCompleteIfBlock(IIndenterSettings indenterSettings)`
	`9`	`+ : base(indenterSettings, $"{Tokens.Then}", $"{Tokens.End} {Tokens.If}") { }`
`12`	`10`
`13`	`11`	`protected override bool MatchInputTokenAtEndOfLineOnly => true;`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`	`1`	`using Rubberduck.Parsing.Grammar;`
`2`	`2`	`using Rubberduck.SmartIndenter;`
`3`		`-using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;`
`4`	`3`
`5`	`4`	`namespace Rubberduck.AutoComplete`
`6`	`5`	`{`
`7`	`6`	`public class AutoCompleteOnErrorResumeNextBlock : AutoCompleteBlockBase`
`8`	`7`	`{`
`9`		`- public AutoCompleteOnErrorResumeNextBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)`
`10`		`- : base(api, indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0") { }`
	`8`	`+ public AutoCompleteOnErrorResumeNextBlock(IIndenterSettings indenterSettings)`
	`9`	`+ : base(indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0") { }`
`11`	`10`
`12`	`11`	`protected override bool ExecuteOnCommittedInputOnly => false;`
`13`	`12`	`}`