Feature: Add Python and JavaScript support to language options

Author: deanthecoder

CodeIngest.Desktop/MainViewModel.cs

@@ -34,6 +34,8 @@ public class MainViewModel : ViewModelBase
     private bool m_excludeImports = Settings.Instance.ExcludeImports;
     private bool m_useFullPaths = Settings.Instance.UseFullPaths;
     private bool m_excludeComments = Settings.Instance.ExcludeComments;
+    private bool m_isPython = Settings.Instance.IsPython;
+    private bool m_isJavaScript = Settings.Instance.IsJavaScript;
     private int? m_previewFileCount;
     private long? m_previewFileSize;
     private bool m_isGeneratingPreview;
@@ -90,6 +92,32 @@ public bool IsCppWithHeaders
         }
     }
 
+    public bool IsPython
+    {
+        get => m_isPython;
+        set
+        {
+            if (SetField(ref m_isPython, value))
+            {
+                Settings.Instance.IsPython = value;
+                InvalidatePreviewStats();
+            }
+        }
+    }
+
+    public bool IsJavaScript
+    {
+        get => m_isJavaScript;
+        set
+        {
+            if (SetField(ref m_isJavaScript, value))
+            {
+                Settings.Instance.IsJavaScript = value;
+                InvalidatePreviewStats();
+            }
+        }
+    }
+
     public bool ExcludeImports
     {
         get => m_excludeImports;
@@ -197,6 +225,10 @@ public async Task RunIngest()
             filterExtensions = [".cpp"];
         else if (IsCppWithHeaders)
             filterExtensions = [".cpp", ".h"];
+        else if (IsPython)
+            filterExtensions = [".py"];
+        else if (IsJavaScript)
+            filterExtensions = [".js"];
         else
             filterExtensions = [".cs"];
 

CodeIngest.Desktop/Settings.cs

@@ -67,12 +67,26 @@ public bool UseFullPaths
         set => Set(value);
     }
 
+    public bool IsPython
+    {
+        get => Get<bool>();
+        set => Set(value);
+    }
+
+    public bool IsJavaScript
+    {
+        get => Get<bool>();
+        set => Set(value);
+    }
+
     protected override void ApplyDefaults()
     {
         RootFolder = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToDir();
         IsCSharp = true;
         IsCppNoHeaders = false;
         IsCppWithHeaders = false;
+        IsPython = false;
+        IsJavaScript = false;
         ExcludeImports = true;
         ExcludeComments = true;
         IncludeMarkdown = false;

CodeIngest.Desktop/Views/MainWindow.axaml

@@ -97,21 +97,26 @@
                 <Border Grid.Row="1" BorderThickness="1" Margin="0,16,0,0">
                     <StackPanel>
                         <!-- ReSharper disable once Xaml.StyleClassNotFound -->
-                        <TextBlock Text="Options" Classes="Overline" Margin="4"/>
-                        <StackPanel Margin="8">
-                            <CheckBox Content="Export Full Paths" IsChecked="{Binding UseFullPaths}"/>
-
-                            <RadioButton Content="C#" Margin="0,16,0,0" IsChecked="{Binding IsCSharp}"/>
-                            <RadioButton Content="C/C++ (No Headers)" IsChecked="{Binding IsCppNoHeaders}" Margin="0,4"/>
-                            <RadioButton Content="C/C++ (With Headers)" IsChecked="{Binding IsCppWithHeaders}" />
+                        <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="Python" IsChecked="{Binding IsPython}" Margin="0,4,0,0"/>
+                            <RadioButton Content="JavaScript" IsChecked="{Binding IsJavaScript}" Margin="0,4,0,0"/>
+                        </StackPanel>
 
-                            <CheckBox Content="Exclude Imports" Margin="0,16,0,0"
+                        <TextBlock Text="Options" Classes="Overline" Margin="4,16,4,4"/>
+                        <StackPanel Margin="8,4">
+                            <CheckBox Content="Exclude Imports"
                                       ToolTip.Tip="Remove using/#include/etc statements from the output."
                                       IsChecked="{Binding ExcludeImports}" />
-                            <CheckBox Content="Exclude comments" Margin="0,4"
+                            <CheckBox Content="Exclude comments" Margin="0,4,0,0"
                                       ToolTip.Tip="Remove // and /*-style comments from the output."
                                       IsChecked="{Binding ExcludeComments}" />
-                            <CheckBox Content="Include Markdown"
+                            <CheckBox Content="Include Full Paths" Margin="0,4,0,0"
+                                      IsChecked="{Binding UseFullPaths}"/>
+                            <CheckBox Content="Include Markdown" Margin="0,4,0,0"
                                       ToolTip.Tip="Include .md files in the output."
                                       IsChecked="{Binding IncludeMarkdown}" />
                         </StackPanel>

CodeIngestLib/Ingester.cs

@@ -121,12 +121,15 @@ private static bool ShouldIncludeSourceLine(string s, IngestOptions options)
             return false;
         var trimmed = s.Trim();
 
-        if (options.ExcludeImports && s.StartsWith("using") || s.StartsWith("#include") || s.StartsWith("#pragma") || trimmed.StartsWith("namespace"))
-            return false;
+        if (options.ExcludeImports)
+        {
+            if (trimmed.StartsWith("using") || trimmed.StartsWith("#include") || trimmed.StartsWith("#pragma") || trimmed.StartsWith("namespace") || trimmed.StartsWith("import") || trimmed.StartsWith("from "))
+                return false;
+        }
 
         if (options.StripComments)
         {
-            if (trimmed.StartsWith("//"))
+            if (trimmed.StartsWith("//") || trimmed.StartsWith("# "))
                 return false;
             if (trimmed.StartsWith("/*") && trimmed.EndsWith("*/"))
                 return false;