Other: Simplify C/C++ language selection by merging header options.

Author: deanthecoder

CodeIngest.Desktop/MainViewModel.cs

@@ -28,8 +28,7 @@ public class MainViewModel : ViewModelBase
     private FolderTreeRoot m_root;
     private ProgressToken m_backgroundRefreshProgress;
     private bool m_isCSharp = Settings.Instance.IsCSharp;
-    private bool m_isCppNoHeaders = Settings.Instance.IsCppNoHeaders;
-    private bool m_isCppWithHeaders = Settings.Instance.IsCppWithHeaders;
+    private bool m_isCpp = Settings.Instance.IsCpp;
     private bool m_includeMarkdown = Settings.Instance.IncludeMarkdown;
     private bool m_excludeImports = Settings.Instance.ExcludeImports;
     private bool m_useFullPaths = Settings.Instance.UseFullPaths;
@@ -66,32 +65,19 @@ public bool IsCSharp
         }
     }
 
-    public bool IsCppNoHeaders
+    public bool IsCpp
     {
-        get => m_isCppNoHeaders;
+        get => m_isCpp;
         set
         {
-            if (SetField(ref m_isCppNoHeaders, value))
+            if (SetField(ref m_isCpp, value))
             {
-                Settings.Instance.IsCppNoHeaders = value;
+                Settings.Instance.IsCpp = value;
                 InvalidatePreviewStats();
             }
         }
     }
-
-    public bool IsCppWithHeaders
-    {
-        get => m_isCppWithHeaders;
-        set
-        {
-            if (SetField(ref m_isCppWithHeaders, value))
-            {
-                Settings.Instance.IsCppWithHeaders = value;
-                InvalidatePreviewStats();
-            }
-        }
-    }
-
+    
     public bool IsPython
     {
         get => m_isPython;
@@ -221,9 +207,9 @@ public async Task RunIngest()
             return; // Nothing to do.
 
         string[] filterExtensions;
-        if (IsCppNoHeaders)
+        if (IsCpp)
             filterExtensions = [".cpp"];
-        else if (IsCppWithHeaders)
+        else if (IsCpp)
             filterExtensions = [".cpp", ".h"];
         else if (IsPython)
             filterExtensions = [".py"];
@@ -267,12 +253,10 @@ private IngestOptions GetIngestOptions()
         if (IsCSharp)
         {
             options.FilePatterns.Add("*.cs");
-        } else if (IsCppNoHeaders)
-        {
-            options.FilePatterns.Add("*.cpp");
-        } else if (IsCppWithHeaders)
+        } else if (IsCpp)
         {
-            options.FilePatterns.Add("*.h");
+            if (!ExcludeImports)
+                options.FilePatterns.Add("*.h");
             options.FilePatterns.Add("*.cpp");
         }
 

CodeIngest.Desktop/Settings.cs

@@ -31,13 +31,7 @@ public bool IsCSharp
         set => Set(value);
     }
 
-    public bool IsCppNoHeaders
-    {
-        get => Get<bool>();
-        set => Set(value);
-    }
-    
-    public bool IsCppWithHeaders
+    public bool IsCpp
     {
         get => Get<bool>();
         set => Set(value);
@@ -83,8 +77,7 @@ protected override void ApplyDefaults()
     {
         RootFolder = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToDir();
         IsCSharp = true;
-        IsCppNoHeaders = false;
-        IsCppWithHeaders = false;
+        IsCpp = false;
         IsPython = false;
         IsJavaScript = false;
         ExcludeImports = true;

CodeIngest.Desktop/Views/MainWindow.axaml

@@ -100,12 +100,12 @@
                         <TextBlock Text="Languages" Classes="Overline" Margin="4"/>
                         <StackPanel Margin="8,4">
                             <RadioButton Content="C#" IsChecked="{Binding IsCSharp}"/>
-                            <RadioButton Content="C/C++ (No Headers)" IsChecked="{Binding IsCppNoHeaders}" Margin="0,4,0,0"/>
-                            <RadioButton Content="C/C++ (With Headers)" IsChecked="{Binding IsCppWithHeaders}" Margin="0,4,0,0"/>
+                            <RadioButton Content="C/C++" IsChecked="{Binding IsCpp}" Margin="0,4,0,0"/>
                             <RadioButton Content="Python" IsChecked="{Binding IsPython}" Margin="0,4,0,0"/>
                             <RadioButton Content="JavaScript" IsChecked="{Binding IsJavaScript}" Margin="0,4,0,0"/>
                         </StackPanel>
 
+                        <!-- ReSharper disable once Xaml.StyleClassNotFound -->
                         <TextBlock Text="Options" Classes="Overline" Margin="4,16,4,4"/>
                         <StackPanel Margin="8,4">
                             <CheckBox Content="Exclude Imports"