Indenter preview

Author: Hosch250

RetailCoder.VBE/UI/Settings/IndenterSettings.xaml

@@ -178,13 +178,16 @@
             </StackPanel>
         </ScrollViewer>
 
-        <TextBlock Grid.Row="1"
-                   Background="White"
-                   Height="100"
-                   xml:space="preserve"
-                   Margin="5,0"
-                   FontFamily="Consolas"
-                   VerticalAlignment="Bottom"
-                   Text="{Binding PreviewSampleCode}"/>
+        <ScrollViewer Grid.Row="1"
+                      VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollBarVisibility="Auto">
+            <TextBlock Background="White"
+                       xml:space="preserve"
+                       Margin="5,0"
+                       FontFamily="Consolas"
+                       VerticalAlignment="Top"
+                       Text="{Binding PreviewSampleCode}"
+                       ScrollViewer.VerticalScrollBarVisibility="Visible"/>
+        </ScrollViewer>
     </Grid>
 </UserControl>

RetailCoder.VBE/UI/Settings/IndenterSettingsViewModel.cs

@@ -1,4 +1,5 @@
-using Rubberduck.Settings;
+using System;
+using Rubberduck.Settings;
 using Rubberduck.SmartIndenter;
 
 namespace Rubberduck.UI.Settings
@@ -7,22 +8,22 @@ public class IndenterSettingsViewModel : ViewModelBase, ISettingsViewModel
     {
         public IndenterSettingsViewModel(Configuration config)
         {
-            AlignCommentsWithCode = config.UserSettings.IndenterSettings.AlignCommentsWithCode;
-            AlignContinuations = config.UserSettings.IndenterSettings.AlignContinuations;
-            AlignDimColumn = config.UserSettings.IndenterSettings.AlignDimColumn;
-            AlignDims = config.UserSettings.IndenterSettings.AlignDims;
-            EnableUndo = config.UserSettings.IndenterSettings.EnableUndo;
-            EndOfLineCommentColumnSpaceAlignment = config.UserSettings.IndenterSettings.EndOfLineCommentColumnSpaceAlignment;
-            EndOfLineCommentStyle = config.UserSettings.IndenterSettings.EndOfLineCommentStyle;
-            ForceCompilerDirectivesInColumn1 = config.UserSettings.IndenterSettings.ForceCompilerDirectivesInColumn1;
-            ForceDebugStatementsInColumn1 = config.UserSettings.IndenterSettings.ForceDebugStatementsInColumn1;
-            IgnoreOperatorsInContinuations = config.UserSettings.IndenterSettings.IgnoreOperatorsInContinuations;
-            IndentCase = config.UserSettings.IndenterSettings.IndentCase;
-            IndentCompilerDirectives = config.UserSettings.IndenterSettings.IndentCompilerDirectives;
-            IndentEntireProcedureBody = config.UserSettings.IndenterSettings.IndentEntireProcedureBody;
-            IndentFirstCommentBlock = config.UserSettings.IndenterSettings.IndentFirstCommentBlock;
-            IndentFirstDeclarationBlock = config.UserSettings.IndenterSettings.IndentFirstDeclarationBlock;
-            IndentSpaces = config.UserSettings.IndenterSettings.IndentSpaces;
+            _alignCommentsWithCode = config.UserSettings.IndenterSettings.AlignCommentsWithCode;
+            _alignContinuations = config.UserSettings.IndenterSettings.AlignContinuations;
+            _alignDimColumn = config.UserSettings.IndenterSettings.AlignDimColumn;
+            _alignDims = config.UserSettings.IndenterSettings.AlignDims;
+            _enableUndo = config.UserSettings.IndenterSettings.EnableUndo;
+            _endOfLineCommentColumnSpaceAlignment = config.UserSettings.IndenterSettings.EndOfLineCommentColumnSpaceAlignment;
+            _endOfLineCommentStyle = config.UserSettings.IndenterSettings.EndOfLineCommentStyle;
+            _forceCompilerDirectivesInColumn1 = config.UserSettings.IndenterSettings.ForceCompilerDirectivesInColumn1;
+            _forceDebugStatementsInColumn1 = config.UserSettings.IndenterSettings.ForceDebugStatementsInColumn1;
+            _ignoreOperatorsInContinuations = config.UserSettings.IndenterSettings.IgnoreOperatorsInContinuations;
+            _indentCase = config.UserSettings.IndenterSettings.IndentCase;
+            _indentCompilerDirectives = config.UserSettings.IndenterSettings.IndentCompilerDirectives;
+            _indentEntireProcedureBody = config.UserSettings.IndenterSettings.IndentEntireProcedureBody;
+            _indentFirstCommentBlock = config.UserSettings.IndenterSettings.IndentFirstCommentBlock;
+            _indentFirstDeclarationBlock = config.UserSettings.IndenterSettings.IndentFirstDeclarationBlock;
+            _indentSpaces = config.UserSettings.IndenterSettings.IndentSpaces;
 
             PropertyChanged += IndenterSettingsViewModel_PropertyChanged;
         }
@@ -262,14 +263,72 @@ public int IndentSpaces
         }
 
         // ReSharper disable once InconsistentNaming
-        private const string _previewSampleCode = @"Sub Foo()
-    ' Do something here
-    ' xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ' comment here
-End Sub";
+        private const string _previewSampleCode =
+@"' Example Procedure
+Sub ExampleProc()
+
+    ' SMART INDENTER
+    '@ 2016 by Rubberduck VBA.
+
+    Dim iCount As Integer
+    Static sName As String
+
+    If YouWantMoreExamplesAndTools Then
+        ' Visit http://rubberduckvba.com/
+
+        Select Case X
+        Case ""A""
+            ' If you have any comments or suggestions, _
+	         or find valid VBA code that isn't indented correctly,
+
+	        #If VBA6 Then
+	            MsgBox ""Contact contact@rubberduck-vba.com""
+	        #End If
+
+        Case ""Continued strings and parameters can be"" _
+           & ""lined up for easier reading, optionally ignoring"" _
+           , ""any operatirs (&+, etc) at the start of the line.""
+
+           Debug.Print ""X<>1""
+        End Select                                'Case X
+    End If                                        'More Tools?
+
+End Sub
+";
 
         public string PreviewSampleCode 
         {
-            get { return _previewSampleCode; /* SmartIndenter.Indent(_indenterData); */ }
+            get
+            {
+                var indenter = new Indenter(null, GetCurrentSettings);
+
+                var lines = _previewSampleCode.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+                indenter.Indent(lines, "TestModule", false);
+                return string.Join(Environment.NewLine, lines);
+            }
+        }
+
+        private IIndenterSettings GetCurrentSettings()
+        {
+            return new SmartIndenter.IndenterSettings
+            {
+                AlignCommentsWithCode = AlignCommentsWithCode,
+                AlignContinuations = AlignContinuations,
+                AlignDimColumn = AlignDimColumn,
+                AlignDims = AlignDims,
+                EnableUndo = EnableUndo,
+                EndOfLineCommentColumnSpaceAlignment = EndOfLineCommentColumnSpaceAlignment,
+                EndOfLineCommentStyle = EndOfLineCommentStyle,
+                ForceCompilerDirectivesInColumn1 = ForceCompilerDirectivesInColumn1,
+                ForceDebugStatementsInColumn1 = ForceDebugStatementsInColumn1,
+                IgnoreOperatorsInContinuations = IgnoreOperatorsInContinuations,
+                IndentCase = IndentCase,
+                IndentCompilerDirectives = IndentCompilerDirectives,
+                IndentEntireProcedureBody = IndentEntireProcedureBody,
+                IndentFirstCommentBlock = IndentFirstCommentBlock,
+                IndentFirstDeclarationBlock = IndentFirstDeclarationBlock,
+                IndentSpaces = IndentSpaces
+            };
         }
 
         #endregion