.env.example

@@ -1 +0,0 @@
-OBSIDIAN_CONFIG_FOLDER=

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: Report a bug and help improve the plugin
-title: '[BUG] '
+title: '[BUG] Short description of the bug'
 labels: bug
 assignees: shumadrid
 body:
@@ -11,52 +11,60 @@ body:
   - type: textarea
     attributes:
       label: Description
-      description: A clear and concise description of the bug. Include any relevant details and steps to reproduce.
+      description: A clear and concise description of the bug. Include any relevant details.
     validations:
       required: true
-  - type: dropdown
-    id: os
+  - type: textarea
     attributes:
-      label: Operating system
-      description: Which OS are you using?
-      options:
-        - Windows
-        - Linux
-        - macOS
-        - Android
-        - iOS
+      label: Steps to Reproduce
+      description: Provide a step-by-step description.
+      value: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Notice that '...'
+        ...
     validations:
       required: true
-  - type: dropdown
-    id: installation-method
+  - type: textarea
     attributes:
-      label: Installation Method (Linux)
-      description: Only necessary on Linux
-      options:
-        - Flatpak
-        - AppImage
-        - Snap
-        - Other
+      label: Expected Behavior
+      description: What did you expect to happen?
     validations:
-      required: false
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: What actually happened? Include error messages if available.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Environment Information
       description: Environment Information
       value: |
-        - **Plugin Version**:
-        - **Obsidian Version**:
+        - **Plugin Version**: [e.g., 1.0.0]
+        - **Obsidian Version**: [e.g., v1.3.2]
+        - **Operating System**: [e.g., Windows 10]
     validations:
       required: true
   - type: textarea
     attributes:
       label: Attachments
-      description: Attach a video or the vault where the bug occurs. Can be helpful to speed up the bug fix.
+      description: Required for bug reproduction
+      value: |
+        - Please attach a video showing the bug. It is not mandatory, but might be very helpful to speed up the bug fix
+        - Please attach a sample vault where the bug can be reproduced. It is not mandatory, but might be very helpful to speed up the bug fix
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Confirmations
       description: Ensure the following conditions are met
       options:
+        - label: I attached a video showing the bug, or it is not necessary
+          required: true
+        - label: I attached a sample vault where the bug can be reproduced, or it is not necessary
+          required: true
         - label: I have tested the bug with the latest version of the plugin
           required: true
         - label: I have checked GitHub for existing bugs

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Request a feature and help improve the plugin
-title: '[FR] '
+title: '[FR] Short description of the feature'
 labels: enhancement
 assignees: shumadrid
 body:
@@ -14,11 +14,47 @@ body:
       description: A clear and concise description of the feature request. Include any relevant details.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Details
+      description: Provide a step-by-step description.
+      value: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Notice that '...'
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Desired Behavior
+      description: What do you want to happen?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: What actually happens?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Attachments
+      description: Required for feature investigation
+      value: |
+        - Please attach a video showing the current behavior. It is not mandatory, but might be very helpful to speed up the feature implementation
+        - Please attach a sample vault where the desired Feature Request could be applied. It is not mandatory, but might be very helpful to speed up the feature implementation
+    validations:
+      required: true
   - type: checkboxes
     attributes:
       label: Confirmations
       description: Ensure the following conditions are met
       options:
+        - label: I attached a video showing the current behavior, or it is not necessary
+          required: true
+        - label: I attached a sample vault where the desired Feature Request could be applied, or it is not necessary
+          required: true
         - label: I have tested the absence of the requested feature with the latest version of the plugin
           required: true
         - label: I have checked GitHub for existing Feature Requests

.github/ISSUE_TEMPLATE/question.yml

@@ -1,11 +0,0 @@
-name: Question
-description: Ask a question about the plugin
-title: '[Q] '
-labels: question
-body:
-  - type: textarea
-    attributes:
-      label: Question
-      description: Write your question here.
-    validations:
-      required: true

.github/workflows/dependency-review.yml

@@ -1,37 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable
-# packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
-name: 'Dependency review'
-on:
-  pull_request:
-
-# If using a dependency submission action in this workflow this permission will need to be set to:
-#
-# permissions:
-#   contents: write
-#
-# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api
-permissions:
-  contents: read
-  # Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option
-  pull-requests: write
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout repository'
-        uses: actions/checkout@v4
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
-        # Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
-        with:
-          comment-summary-in-pr: always
-          deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later
-          retry-on-snapshot-warnings: true

.github/workflows/main.yaml

@@ -1,53 +0,0 @@
-name: 'Main Workflow'
-on:
-  pull_request:
-  push:
-permissions:
-  contents: read
-
-jobs:
-  svelte-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout repository'
-        uses: actions/checkout@v4
-      - name: Install modules
-        run: npm install
-      - name: Run Svelte-Check
-        run: npm run build:compile:svelte
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install modules
-        run: npm install
-      - name: Run build
-        run: npm run build
-
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install modules
-        run: npm install
-      - name: Run Prettier
-        run: npm run format:check
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install modules
-        run: npm install
-      - name: Run ESLint
-        run: npm run lint
-
-  spellcheck:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install modules
-        run: npm install
-      - name: Run CSpell
-        run: npm run spellcheck

CHANGELOG.md

@@ -1,78 +1,5 @@
 # CHANGELOG
 
-## 0.6.0
-
-### Features
-
-- "Review changes reminder" feature. Receive a notification to review changes in your vault at a recurring interval (disabled by default).
-
-### Bug Fixes
-
-- More accurate descriptions for the whitespace ignore settings.
-
-## 0.5.1
-
-### Bug Fixes
-
-- Stop auto initializing the first checkpoint (#4 Thanks to @texastoland for the suggestion).
-- Shorten "Approve & create new checkpoint" button text.
-
-## 0.5.0
-
-### What's Changed
-
-#### Features
-
-- New "Compare two vault states in history" and "Show vault changes since the last checkpoint" commands. The results of these commands are shown in a temporary side view.
-- Add validation to settings tab UI and polish the layout.
-- Display a message in the file changelog view when the opened file is ignored by Git.
-- Mention unusual scenarios that can lead to the "File has no git history" state in the file changelog view. (#3 Thanks to @AMC-Albert for the suggestion!)
-- Option to convert ExcludeFilesAndFolders to an include list.
-- Option to temporarily disable the ExcludeFilesAndFolders list.
-- Reorganized the settings internally. Users that are updating from a previous version will need to reconfigure all settings that have been affected.
-
-#### Bug Fixes
-
-- Clear the file changelog view if no DiffViews are visible.
-- Improved conditional changelog recalculation logic on settings changes.
-- Fix an issue where the date labels of the changelog versions were sometimes staying outdated.
-- Prevent excluding the git root folder from the vault changelog.
-- Prevent adding paths above git root folder to the exclude list to avoid git errors.
-- Apply the "Day start time" setting only when the day interval for a changelog is active (to avoid confusion).
-- Update the minimum required Obsidian version to 1.8.9.
-
-## 0.4.0
-
-### Features
-
-- Add options for ignoring whitespace changes.
-- Expand "Copy commit hash" context menu option to also copy the file path when possible.
-
-### Bug Fixes
-
-- Make the plugin load faster by reducing file size.
-- Disable "Change interval" button for the file changelog when no file is opened.
-- Don't forget the collapsed state of the first version when chaining recomputes.
-- Make the status bar stats recognize renamed files once they're committed instead of treating them as new.
-- Ensure version labels are displayed in the user's specified timezone.
-- Remove redundant Git plugin initialization check on startup.
-- Add more detail to incompatibility notices about the installed Git plugin version.
-- Prevent expanding large number of versions in the vault changelog view as a temporary workaround for performance degradations.
-
-## 0.3.0
-
-### Features
-
-- Add "Copy commit hash" context menu item.
-- Add "Git changelog: Exclude/Reinclude" context menu item.
-
-### Bug Fixes
-
-- Show loading state when status bar stats are computing.
-- Improve ExcludeFilesAndFolders parsing logic.
-- Fix faulty status bar's queue logic that was sabotaging other tasks.
-- Revert faulty "is binary file" check.
-
 ## 0.2.1
 
 ### Bug Fixes

README.md

@@ -1,104 +1,66 @@
 # Git Changelog
 
-An [Obsidian](https://obsidian.md) plugin that utilizes Git commit history to display dynamic changelogs in your sidebar. Also usable as a practical data loss monitoring tool.
-
-> [!NOTE]
-> January 2026 update: I didn't forget about this plugin, I'm just busy with other stuff currently. I plan to continue working on it when I get the time.
-> If in the meantime a change happens in Obsidian or the Git plugin that breaks this plugin, I'll fix it.
-
-![Showcase](.github/showcase.gif)
-
-## Table of Contents
-
-- [Installation](#installation)
-- [Features](#features)
-  - [Vault Changelog View](#vault-changelog-view)
-  - [File Changelog View](#file-changelog-view)
-  - [Changelog Customizability](#changelog-customizability)
-  - [Live Stats in the Status Bar for the Current Note](#live-stats-in-the-status-bar-for-the-current-note)
-  - [Integration with Git Plugin's Diff View](#integration-with-git-plugins-diff-view)
-  - [Compare Two Vault States in History](#compare-two-vault-states-in-history)
-  - [Show Vault Changes since the Last Checkpoint](#show-vault-changes-since-the-last-checkpoint)
-- [Data Loss Monitoring](#data-loss-monitoring)
-  - [Common Causes of Data Loss](#common-causes-of-data-loss)
-  - [How to Use](#how-to-use)
-- [Limitations](#limitations)
-- [Roadmap](#roadmap)
-- [Alternatives](#alternatives)
-- [FAQ](#faq)
-- [Debugging](#debugging)
-- [Contributing](#contributing)
-- [Credits](#credits)
+A new [Obsidian](https://obsidian.md) plugin that utilizes Git commit history to display dynamic changelogs in your sidebar. Also usable as a practical data loss monitoring tool.
 
 ## Installation
 
-[Download](https://obsidian.md/plugins?id=git-changelog) the plugin from the official Community Plugins repository.
+To install the plugin, follow these steps:
+
+1. Make sure to have the [BRAT plugin](https://obsidian.md/plugins?id=obsidian42-brat) installed and enabled.
+2. Paste this link in your browser and press enter:
+
+   `obsidian://brat?plugin=https://github.com/shumadrid/obsidian-git-changelog`
+
+3. An Obsidian pop-up window should appear. In the window, click the 'Add plugin' button once and wait a few seconds for the plugin to install.
+
+The plugin is NOT yet available in [the official Community Plugins repository](https://obsidian.md/plugins).
 
 > [!IMPORTANT]
 > Requires the [Git plugin](https://github.com/Vinzent03/obsidian-git) to be installed. Installing it and maintaining a Git repository can be beneficial, even if you rely on other syncing services.
 
 > [!NOTE]
-> This plugin is currently in beta and still under development, so your existing settings may break after each update. If some saved settings were broken, they will be mentioned in the changelog.
+> This plugin is currently in beta and still under development, so your existing settings may break after each update.
 
 ## Features
 
-To easily see the what's new in future updates, it's recommended to use the [Plugin Update Tracker](https://obsidian.md/plugins?id=obsidian-plugin-update-tracker).
-
 ### Vault Changelog View
 
-![Vault Changelog View](.github/vault-changelog-view.webp)
-
 - Detects renamed and moved files separately.
 - Shows the total count of lines added and deleted.
-- Displays counts of files added, modified, moved/renamed and deleted (total or text and non-text separately). **NOTE:** If a file is both renamed/moved and modified, it will contribute towards the renamed/moved files stats.
+- Displays counts of files added, modified, deleted, and moved/renamed (total or text and non-text separately). If a file is both renamed/moved and modified, it will contribute towards the renamed files stats.
 - Lists per file lines added and deleted, along with additional file statuses (**A**dded, **R**enamed, **M**oved, or **D**eleted).
-  - The files are sorted from most number of lines changed to least.
 - **Exclude Files and Folders:**
 
-  - Usually you specify files and folders you want to exclude from your Git repository in the `.gitignore` file.
+  Usually you specify files and folders you want to exclude from your Git repository in the `.gitignore` file.
 
-    Example of suggested items to put in `.gitignore` include OS specific files like `.DS_Store`, `.obsidian/workspace.json` and other plugins' cache files that constantly change and trigger commits even when no changes were made to the vault. These files usually don't hold any important user data and are regenerated easily (in case of needing to restore the vault from a backup).
+  But this setting is useful if you want to keep some files in your repository but exclude them from appearing in the vault changelog.
 
-    But this setting is useful if you want to keep some files backed up by your repository (e.g. because they're valuable), but exclude them from appearing in the vault changelog.
+  Common examples for this: `.trash` and `.obsidian` folders, `.canvas` files, or syncing service conflict files that can clutter the changelog stats.
 
-    Common examples for this: `/.trash`, `/attachments` and `/.obsidian` folders, debug/log files, or conflict files generated by a syncing service that can clutter the changelog stats.
-
-    Also use this setting to filter files and folders that already exist in previous commits, since specifying files in .gitignore doesn't remove them from previous commits.
-
-  - **Context menu integration:** To exclude a file or folder, just right-click on it inside the File explorer and select "Git changelog: Exclude" from the context menu, no need to manually define paths.
-
-  - For advanced users: If you configured your Git repository to be below the vault root directory, the paths should be relative to the Git repo, not the vault.
-
-- **Include items instead:**
-
-  - Convert the `Exclude Files and Folders` list to an include list, while excluding everything else.
-
-  - An example case where this can come in handy is when you notice your vault misbehaving, you can trigger this setting and put `.obsidian` in the list to exclusively see changes made inside your configuration folder.
-
-    Then you can easily investigate what settings recently changed and if some of the changes are the cause of your issue.
+![Vault Changelog View](.github/vault-changelog-view.webp)
 
 ### File Changelog View
 
+- Shows the count of added and deleted lines for all previous versions of the active note.
+- Only Markdown files are currently supported.
+
 ![File Changelog View](.github/file-changelog-view.webp)
 
-- Shows the count of added and deleted lines for all previous versions of the active note.
-
 > [!WARNING]
-> Showing a lot of versions and files will reduce view performance. This will be fixed soon.
+> Using the "Expand all" toggle will reduce view performance. This will be fixed soon.
 
 ### Changelog Customizability
 
 - Set a custom day start time (if you're a night owl and want to track your actual days).
 - Set a custom timezone to base the intervals on or detect it automatically.
-- Easily switch between hourly, daily, weekly, and monthly intervals.
-- Choose from 5 options to ignore whitespace changes with varying intensity.
+- Choose to view hourly, daily, weekly, or monthly intervals.
 - **Adjust file rename detection strictness:**
 
-  - Git can't actually track which files you renamed. Instead, it tries to detect renames by comparing the file contents of the old and new files.
+  Git can't actually track which files you renamed. Instead, it tries to detect renames by comparing the file contents of the old and new files.
 
-    It can falsely mark new files as some old file getting renamed, and it can miss actual renames and mark them as separate files getting deleted and created.
+  It can falsely mark new files as some old file getting renamed, and it can miss actual renames and mark them as separate files getting deleted and created.
 
-  - Higher strictness results in detecting less renames.
+  Higher strictness results in detecting less renames.
 
 ### Live Stats in the Status Bar for the Current Note
 
@@ -108,37 +70,6 @@ To easily see the what's new in future updates, it's recommended to use the [Plu
 
 - Click on any file version in the changelog views to open the corresponding diff view showing the changes.
 
-> [!WARNING]
-> Currently, only the "Split" diff view works. The "Unified" view shows inaccurate changes.
-
-### Compare Two Vault States in History
-
-- Use the `Compare two vault states in history` command to compare any two points in the vault's Git history.
-
-- All settings that apply to the changelog views also apply to this command.
-
-  ![Vault's git history comparison](.github/vault-git-history-comparison-modal.png)
-
-### Show Vault Changes since the Last Checkpoint
-
-- The easiest way to track all changes made to your vault over time is to use the `Show vault changes since the last checkpoint` command to open a temporary view that shows all changes that happened since the last checkpoint (meaning: the last time you ran this command and approved the shown changes by creating a new checkpoint).
-
-- If you're someone who's always concerned about data integrity, you don't need to have the vault changelog view open all the time in order to track changes. 😁 Just run this command every now and then to inspect all changes made since the last time you checked. (Be it a few minutes ago or a few months.)
-
-- Optionally receive a notification at a recurring set interval (in minutes) that reminds you to review the changes made since the last checkpoint.
-
-- If you don't like that this command is using the latest commit as the comparison point instead of the live vault state:
-
-  - You can create an action (macro) using the [QuickAdd](https://obsidian.md/plugins?id=quickadd) plugin that will:
-    1. Run the "Commit-and-sync" or "Commit" command, depending on if you use Github to sync or not (these commands are available through the Git plugin).
-    2. Wait for some time for the commit to complete (e.g. 200ms).
-    3. Run the "Show Vault Changes since the Last Checkpoint" command.
-  - That way you will always compare the current state of your vault to the state of the last checkpoint.
-  - You can assign a hotkey to this macro by exposing it as an Obsidian command ([see how](https://youtu.be/gYK3VDQsZJo?t=179)).
-  - ![Quick Add Macro](.github/quick-add-macro.png)
-
-- All settings that apply to the changelog views also apply to this command.
-
 ## Data Loss Monitoring
 
 This plugin can also serve as a tool for early detection of data loss: if the displayed changelog stats seem incorrect, **unintended** vault changes might have occurred.
@@ -149,63 +80,34 @@ This plugin can also serve as a tool for early detection of data loss: if the di
 - ❌ Faulty plugins
 - ⛓️‍💥 Device malfunction
 - 🤷‍♂️ Accidental text overwrites and other user errors
-- 📜 Running faulty or outdated scripts
 - 🤖 **AI Tools**: They have a tendency to overwrite or delete random content.
 
-The result of all of this can be you asking yourself:
+### How to Use
 
-> Wait, didn’t this note have more lines yesterday? 🤔
+This plugin was not designed to accumulate all changes made inside an interval.
 
-This plugin tries it's best to help you answer that question. 😎
+For example, if you add a block of text, delete it, re-add it, then delete it again in the same day, the changelog will show zero modifications instead of a bunch of additions and deletions.
 
-- The recommended way to monitor for data loss is to simply frequently run the [Show Vault Changes since the Last Checkpoint](#show-vault-changes-since-the-last-checkpoint) command and check if the shown changes seem correct.
+This is because this plugin only compares neighboring versions (intervals) directly, and if a block of text didn't exist in the previous interval and is also absent in the latest interval, zero changes have occurred.
 
-### How it works
+Consequently, if you add text that gets lost within the same interval, you can detect this data loss **not** by seeing a high 'lines deleted' count, but by noticing a lack of expected additions.
 
-- This plugin was not designed to accumulate all changes made inside an interval.
+If some lost data was never committed, it won't be recoverable by Git. So it's recommended to configure a frequent (< 5 minutes) auto-commit interval (no need to manually stage and commit files).
 
-  For example, if you add a block of text, delete it, re-add it, then delete it again in the same day, the changelog will show zero modifications instead of a bunch of additions and deletions.
-
-  This is because this plugin only compares neighboring versions (intervals) directly, and if a block of text didn't exist in the previous interval and is also absent in the latest interval, zero changes have occurred.
-
-  Consequently, if you add text that gets lost within the same interval, you can detect this data loss **not** by seeing a high 'lines deleted' count, but by noticing a lack of expected additions.
-
-- A "Copy commit hash" context menu option is provided so that you can further investigate the commit tied to some suspicious version.
-
-- If some lost data was never committed, it won't be recoverable by Git. So it's recommended to configure a frequent (< 5 minutes) auto-commit interval (no need to manually stage and commit files).
-
-  But if some version of a file wasn't committed, you can still rely on the [File Recovery](https://help.obsidian.md/plugins/file-recovery) plugin, or the [Version history](https://help.obsidian.md/Obsidian+Sync/Version+history) feature to recover it.
-
-  Use the [Version History Diff](https://github.com/kometenstaub/obsidian-version-history-diff) plugin for easier navigation through those versions.
-
-- It's also recommended to occasionally check the integrity of your repo. To do this, open a terminal at your vault's location and just run:
-
-  ```bash
-  git fsck -full
-  ```
+But if some version of a file wasn't committed, you can still rely on the [File Recovery](https://help.obsidian.md/plugins/file-recovery) plugin, or the [Version history](https://help.obsidian.md/Obsidian+Sync/Version+history) feature to recover it.
 
 ## Limitations
 
-⚠️ There are quite a few limitations, and some of them are simply the result of choosing this specific approach to changelog management.
-
 - No meaningful way of tracking changes to canvas files.
-
 - No mobile support yet.
-
 - File changelog doesn't clear if opening a diff view but keeps showing stats for the previous note. This is intentional for quickly switching between versions but may result in showing stats for a closed note. This will be fixed in the future.
-
 - Only status bar counts update live; other views refresh on each commit because of performance reasons.
-
-- Assumes your vault has a linear commit & date history (which it should have). This plugin is not tested or made for repos with non-linear commit history.
-
+- Assumes linear Git commit history. Unexpected branching or merging can produce unexpected results.
 - Git does not track changes inside other nested Git repositories—you should use proper Git submodules instead if you want to track changes for multiple repositories inside your vault.
-
 - By Git design, files/folders specified in `.gitignore` aren't watched for changes.
-
 - Git decides if a file is binary (non-text) or a text file by analyzing the file contents rather than looking at the file extension. If you rename a text file to have a `.png` extension, Git will still count its lines and treat it as a text file.
-
 - If some data loss is only a few words/lines in a heavily edited file, you probably won't notice it. Even though those few lines could have been important.
-
+- When using this plugin, the Git plugin status bar branch indicator may get duplicated. (weird)
 - Interaction with submodules isn't tested yet!
 
 ## Roadmap
@@ -221,79 +123,47 @@ This plugin tries it's best to help you answer that question. 😎
 - [ ] Code cleanup and refactoring.
 - [ ] Improve README.
 - [ ] Folder stats in the Vault changelog view.
-- [x] Command to compare any two points in the vault (repo) history.
+- [ ] Command to compare the current state of the vault (repo) to any point in history.
 - [ ] Extensive per-file type stats.
 - [ ] Optimize computing stats performance.
 - [ ] Integrate the status bar and the file changelog view with [Git plugin's](https://github.com/Vinzent03/obsidian-git) diff views.
 - [ ] Notify if the amount of changes between neighboring commits exceeds a threshold.
 - [ ] File & folder stats inside the File explorer view.
-- [ ] Search & filtering features.
 
 ## Alternatives
 
-If you don't want to depend on Git, check out the these alternative plugins:
-
-- [Vault Changelog](https://github.com/philoserf/obsidian-vault-changelog) - tested and reliable, writes a changelog note to your vault
-
-- [List Modified](https://github.com/franciskafieh/obsidian-list-modified) - popular, links all modified files meeting certain criteria to a note.
-
-- [Edit History](https://github.com/antoniotejada/obsidian-edit-history) - similar to this plugin, but generates it's own history files instead of relying on other tools.
-
-- [Time Machine](https://github.com/dsebastien/obsidian-time-machine) - experimental, relies on snapshots from the Obsidian's core "File recovery" plugin.
+If you don't want to depend on Git, check out the [Vault Changelog](https://github.com/philoserf/obsidian-vault-changelog) plugin.
 
 ## FAQ
 
-- Why is the File changelog view showing inaccurate history for some files?
+### Will this plugin alter my Git repository/config?
 
-  - Most common cases for this are: **The file had its file path changed (renamed/moved or one of its parent folders was renamed/moved)**...
+- No. This plugin is intended to be read-only and does not alter any Git configurations.
+  However, it's in beta, so bugs are possible.
 
-    1. and the change isn't committed yet.
+### I have been using Obsidian for some time but don't have a Git repo set up. Can I still use this plugin to view the history of my vault?
 
-    2. and was also significantly modified, so that the similarity of the old and new version went below the `File move/rename detection strictness` threshold, resulting in Git treating the file as a new file instead of a renamed/moved one.
-
-    3. but the only changes were letter capitalization changes, and now Git is saying that the file has no history. [Why?](https://github.com/shumadrid/obsidian-git-changelog/issues/3) (TLDR: Git is case sensitive, your file system might not be). To solve this:
-
-       1. Add an emoji (or anything) as a prefix in the name to all the affected files/folders in your vault (an easier way is to only prefix all the topmost folders).
-
-       2. Commit all the changes.
-
-       3. After committing, the files will be tracked with the newly capitalized file paths, and you can remove the emoji prefixes.
-
-- Will this plugin alter my Git repository/config?
-
-  - No. This plugin is intended to be read-only and does not alter any Git configurations. However, it's in beta, so bugs are possible.
-
-    The only exception is if you explicitly click the `Apply` button for the `Difference detection algorithm` setting, which applies the selected algorithm to the `.git/config` file. But this setting is easily reversible.
-
-- I have been using Obsidian for some time but don't have a Git repo set up. Can I still use this plugin to view the history of my vault?
-
-  - No. 😔
-
-- After making substantial changes, the plugin is showing unusual stats.
-
-  - Try disabling all exclusion rules and see if it was some exclusion rule that was influencing the stats.
-
-    Example scenario: A folder that was marked as excluded is now moved to a different location, the existing rule no longer affects that folder, so the plugin is showing the files inside that folder as added instead of moved.
+- No. 😔
 
 ## Debugging
 
-- By default, debug messages for this plugin are hidden. They aren't intended for the user.
+By default, debug messages for this plugin are hidden. They aren't intended for the user.
 
-  To show them, enable `Verbose` mode in the console and run the following command:
+To show them, enable `Verbose` mode in the console and run the following command:
 
-  ```bash
-  window.DEBUG.enable('git-changelog');
-  ```
+```js
+window.DEBUG.enable('git-changelog');
+```
 
-- For more details, refer to [this guide](https://github.com/mnaoumov/obsidian-dev-utils?tab=readme-ov-file#debugging).
+For more details, refer to [this guide](https://github.com/mnaoumov/obsidian-dev-utils?tab=readme-ov-file#debugging).
 
 ## Contributing
 
-- Feel free to submit a PR or a feature request. I'd especially appreciate help with styling and restructuring the code.
+Feel free to submit a PR or a feature request. I'd especially appreciate help with styling and restructuring the code.
 
-- This plugin is in beta, so please do report all bugs that you find.
+This plugin is in beta, so please do report all bugs that you find.
 
-- For easier development, [define](https://github.com/mnaoumov/obsidian-dev-utils?tab=readme-ov-file#build-development-version) a `OBSIDIAN_CONFIG_FOLDER` variable and run `npm run dev`.
+For easier development, [define](https://github.com/mnaoumov/generator-obsidian-plugin?tab=readme-ov-file#build-development-version) a `OBSIDIAN_CONFIG_DIR` variable and run `npm run dev`.
 
 ## Credits
 

cspell.json

@@ -4,7 +4,6 @@
   "dictionaryDefinitions": [],
   "dictionaries": [],
   "words": [
-    "allownonascii",
     "binaryop",
     "callouts",
     "currencyformat",
@@ -79,19 +78,16 @@
     "Reinitiate",
     "Repr",
     "shumadrid",
-    "sonarqube",
     "sourcemaps",
     "striptime",
     "subsources",
     "subtags",
     "succ",
     "Syncthing",
-    "texastoland",
     "tsbuildinfo",
     "tsdoc",
     "tsdocs",
     "tseslint",
-    "Uncollapsible",
     "unregisters",
     "vararg",
     "varargs",

eslint.config.mjs

@@ -61,8 +61,6 @@ export default typescriptEslint.config(
       // overrides
       'default-case': 'off',
       '@typescript-eslint/no-unnecessary-condition': 'off',
-      'no-unused-labels': 'off',
-      'no-labels': 'off',
       '@typescript-eslint/restrict-template-expressions': [
         'error',
         { allowNumber: true }
@@ -89,28 +87,7 @@ export default typescriptEslint.config(
         'error',
         {
           ignore: [-1, 0, 1, 2],
-          ignoreDefaultValues: true,
-          ignoreClassFieldInitialValues: true
-        }
-      ],
-      '@typescript-eslint/explicit-function-return-type': [
-        'error',
-        {
-          allowExpressions: true,
-          allowTypedFunctionExpressions: true,
-          allowHigherOrderFunctions: true
-        }
-      ],
-      '@typescript-eslint/no-restricted-imports': [
-        'error',
-        {
-          paths: [
-            {
-              name: 'simple-git',
-              message: 'Please copy paste the needed enum instead.',
-              allowTypeImports: true
-            }
-          ]
+          ignoreDefaultValues: true
         }
       ]
     }

manifest.json

@@ -5,6 +5,6 @@
   "id": "git-changelog",
   "isDesktopOnly": true,
   "name": "Git Changelog",
-  "version": "0.6.0",
-  "minAppVersion": "1.8.10"
+  "version": "0.2.1",
+  "minAppVersion": "1.7.2"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-changelog",
-  "version": "0.6.0",
+  "version": "0.2.1",
   "description": "Uses Git to display dynamic vault and file changelogs in the sidebar, useful for spotting data loss.",
   "keywords": [],
   "license": "MIT",
@@ -16,18 +16,19 @@
     "format": "obsidian-dev-utils format",
     "format:check": "obsidian-dev-utils format:check",
     "lint": "obsidian-dev-utils lint",
-    "lint:fix": "obsidian-dev-utils lint:fix",
     "spellcheck": "obsidian-dev-utils spellcheck",
     "version": "obsidian-dev-utils version"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
+    "@types/deep-equal": "^1.0.4",
     "@types/node": "^22.13.1",
     "@typescript-eslint/eslint-plugin": "^8.23.0",
     "@typescript-eslint/parser": "^8.23.0",
     "builtin-modules": "^5.0.0",
     "color2k": "^2.0.3",
     "compare-versions": "^6.1.1",
+    "deep-equal": "^2.2.3",
     "esbuild": "^0.25.0",
     "esbuild-svelte": "^0.9.2",
     "eslint": "^9.22.0",
@@ -37,9 +38,11 @@
     "eslint-plugin-svelte": "^3.2.2",
     "eslint-plugin-unicorn": "^57.0.0",
     "globals": "^16.0.0",
-    "obsidian": "latest",
-    "obsidian-dev-utils": "26.4.0",
-    "obsidian-typings": "latest",
+    "jiti": "^2.4.2",
+    "lodash": "^4.17.21",
+    "obsidian": "^1.8.7",
+    "obsidian-dev-utils": "^19.8.2",
+    "obsidian-typings": "^2.35.0",
     "prettier": "3.5.3",
     "prettier-plugin-svelte": "^3.3.3",
     "sass": "^1.83.4",
@@ -47,11 +50,10 @@
     "spacetime": "^7.8.0",
     "svelte": "^5.23.1",
     "svelte-eslint-parser": "^0.43.0",
-    "svelte-infinite": "^0.5.0",
     "svelte-preprocess": "^6.0.3",
-    "type-fest": "^4.39.1",
     "typescript": "^5.8.2",
-    "typescript-eslint": "^8.25.0"
+    "typescript-eslint": "^8.25.0",
+    "svelte-infinite": "^0.5.0"
   },
   "overrides": {
     "boolean": "npm:dry-uninstall"

scripts/buildWithSvelte.ts

@@ -1,4 +1,3 @@
-import type { BuildOptions } from 'esbuild';
 import type { CliTaskResult } from 'obsidian-dev-utils/ScriptUtils/CliUtils';
 
 import {
@@ -10,10 +9,6 @@ export async function buildWithSvelte(
   developmentMode: boolean
 ): Promise<CliTaskResult> {
   return await buildObsidianPlugin({
-    customizeEsbuildOptions: (options: BuildOptions) => {
-      options.dropLabels = developmentMode ? undefined : ['DEV'];
-    },
-
     customEsbuildPlugins: [
       {
         name: 'add-condition',

scripts/formatWithPrettier.ts

@@ -1,8 +1,8 @@
-import { getFolderName } from 'obsidian-dev-utils/Path';
+import { getDirname } from 'obsidian-dev-utils/Path';
 import { existsSync } from 'obsidian-dev-utils/ScriptUtils/NodeModules';
 import {
   execFromRoot,
-  getRootFolder,
+  getRootDir,
   resolvePathFromRootSafe
 } from 'obsidian-dev-utils/ScriptUtils/Root';
 
@@ -11,7 +11,7 @@ export async function formatWithPrettier(rewrite: boolean): Promise<void> {
 
   const prettierJsonPath = resolvePathFromRootSafe('.prettierrc.json');
   if (!existsSync(prettierJsonPath)) {
-    const packageDirectory = getRootFolder(getFolderName(import.meta.url));
+    const packageDirectory = getRootDir(getDirname(import.meta.url));
     if (!packageDirectory) {
       throw new Error('Could not find package directory.');
     }

src/GitChangelogPlugin.svelte.ts

@@ -1,41 +1,27 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
 import type { ObsidianGitPlugin } from 'gitPluginTypes.ts';
-import type { Debouncer } from 'obsidian';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { GitChangelogSettings } from 'settings/settings.ts';
+import type { Debouncer, PluginSettingTab } from 'obsidian';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 import type { SimpleGit } from 'simple-git';
 import type { ReadonlyDeep } from 'type-fest';
 
-import {
-  COMPARE_REPO_COMMITS_VIEW_CONFIG,
-  COMPARE_TO_CHECKPOINT_VIEW_CONFIG
-} from 'constants.ts';
 import { FileChangelogManager } from 'core/FileChangelogManager.ts';
-import { runHashObjectEmptyTree } from 'core/gitOperations/runHashObjectEmptyTree.ts';
-import { changelogGenerationSettingsChanged } from 'core/helper.ts';
 import { VaultChangelogManager } from 'core/VaultChangelogManager.ts';
-import { addContextMenuItems } from 'menu.ts';
-import { debounce, Notice } from 'obsidian';
-import { invokeAsyncSafely } from 'obsidian-dev-utils/Async';
+import { debounce, ItemView, Notice } from 'obsidian';
 import { PluginBase } from 'obsidian-dev-utils/obsidian/Plugin/PluginBase';
-import { GitChangelogSettingsManager } from 'settings/settingsManager.ts';
-import { getLocaleToAssign } from 'settings/ui/CustomLocale.ts';
+import { changelogGenerationSettingsChanged } from 'settings/helper.ts';
+import { GitChangelogPluginSettings } from 'settings/settings.ts';
+import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
 import {
   gitPluginCompatibleVersion,
   gitPluginTestedVersion
 } from 'settings/ui/GitPluginWarning.ts';
-import { handleReviewChangesReminderInterval } from 'settings/ui/ReviewChangesReminderInterval.ts';
 import spacetime from 'spacetime';
 import { TaskManager } from 'TaskManager.svelte.ts';
-import { formatDateHour } from 'timeUtils.ts';
-import { assertNotNull, removeCompareVersionsView } from 'utils.ts';
-import { CompareRepoCommitsView } from 'Views/CompareRepoCommits/CompareRepoCommits.ts';
-import { CompareToCheckpointView } from 'Views/CompareToCheckpoint/CompareToCheckpoint.ts';
 import {
   FILE_CHANGELOG_VIEW_CONFIG,
   FileChangelogView
 } from 'Views/FileChangelog/FileChangelog.ts';
-import { getActiveGitRelativeFile, isDiffViewVisible } from 'Views/helper.ts';
+import { getActiveGitRelativeFile, isDiffView } from 'Views/helper.ts';
 import {
   VAULT_CHANGELOG_VIEW_CONFIG,
   VaultChangelogView
@@ -51,26 +37,23 @@ import {
   GitRepoMissingError
 } from './types.ts';
 
-export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
+export class GitChangelogPlugin extends PluginBase<GitChangelogPluginSettings> {
   public debouncedChangelogSettingsChangedCheck:
     | Debouncer<
         [
-          oldSettings: ReadonlyDeep<
-            ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-          >,
-          newSettings: ReadonlyDeep<
-            ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-          >
+          oldSettings: ReadonlyDeep<GitChangelogPluginSettings>,
+          newSettings: ReadonlyDeep<GitChangelogPluginSettings>
         ],
         void
       >
     | undefined;
 
   public gitPluginState = $state<GitPluginState>();
-
   public gitRepoReady = $state<boolean>();
-
   // Used for keeping relative interval labels like "today" and "yesterday" up to date
+  public currentDay = $state<string>();
+  public emptyTreeHash: string | undefined;
+
   public dependenciesReady = $derived(
     (this.gitPluginState === GitPluginState.Enabled ||
       this.gitPluginState === GitPluginState.UntestedVersion) &&
@@ -78,31 +61,14 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
   );
 
   public detectedTimeZone: string | undefined;
-  public detectedLocale: string | undefined;
-  public utcCurrentDateHour = $state<string>(
-    formatDateHour(spacetime.now('utc'))
-  ); // In UTC so it doesn't depend on the timezone setting
-
   public vaultChangelogManager = $state<VaultChangelogManager>();
 
   public fileChangelogManager = $state<FileChangelogManager>();
+  public settingsOfComputedCache?: ChangelogGenerationSettings;
   public statusBarStats?: StatusBarStats;
+
   public cachedActiveGitFile: string | undefined;
 
-  public compareVersionsUtcNewerDate: string | undefined;
-  public compareVersionsUtcOlderDate: string | undefined;
-  public localeSafe = $state<string>('en-US'); // Properly loaded in onLayoutReady
-
-  public checkpointReminderNotice: Notice | undefined;
-
-  public get emptyTreeHashUnsafe(): string {
-    return assertNotNull(this.emptyTreeHash);
-  }
-
-  /**
-   * If we were to persist this, it would be less flexible if the user changes his repo or the hashing algorithm and we would need to either manually have a database of all possible empty tree hashes or validate it in runtime
-   */
-  private emptyTreeHash: string | undefined;
   public async addFileChangelogView(): Promise<void> {
     await this.app.workspace.ensureSideLeaf(
       FILE_CHANGELOG_VIEW_CONFIG.type,
@@ -136,17 +102,9 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
     this.consoleDebug(`Error:`, error.stack);
   }
 
-  public displayNotice(
-    message: DocumentFragment | string,
-    // eslint-disable-next-line no-magic-numbers
-    timeout: number = 3 * 1000
-  ): void {
-    if (message instanceof DocumentFragment) {
-      new Notice(message, timeout);
-      return;
-    }
-
-    new Notice(`${this.manifest.name}:\n${message}`, timeout);
+  // eslint-disable-next-line no-magic-numbers
+  public displayNotice(message: string, timeout: number = 3 * 1000): void {
+    new Notice(`${this.manifest.name}\n${message}`, timeout);
   }
 
   public async getGit(): Promise<SimpleGit> {
@@ -180,60 +138,40 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
     }
   }
 
-  public async getEmptyTreeHash(): Promise<string> {
-    if (this.emptyTreeHash) {
-      return this.emptyTreeHash;
-    }
-    const git = await this.getGit();
-    const emptyTreeHash = await runHashObjectEmptyTree({ git });
-    this.emptyTreeHash ??= emptyTreeHash;
-    return this.emptyTreeHash;
-  }
-
-  // We only pass the relevant settings for checking because if some invalid value was changed to some other invalid value, that means the default value is used in both cases and we discard that change
-  // eslint-disable-next-line @typescript-eslint/require-await
-  public override async onSaveSettings(
-    _newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    _oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    skipCheck?: boolean
+  public override async saveSettings(
+    newSettings: GitChangelogPluginSettings,
+    debounceOnSettingsSave = true
   ): Promise<void> {
-    // If the local setting was modified externally, we need to update the localeSafe property.
-    this.localeSafe = getLocaleToAssign(this);
-
-    if (skipCheck === true) {
-      return;
+    const oldSettings = this.settings;
+    await super.saveSettings(newSettings);
+    if (debounceOnSettingsSave) {
+      this.debouncedChangelogSettingsChangedCheck?.(oldSettings, newSettings);
+    } else {
+      this.onSettingsSave(oldSettings, newSettings);
     }
-    this.debouncedChangelogSettingsChangedCheck?.(_oldSettings, _newSettings);
   }
 
-  protected override createSettingsTab(): GitChangelogSettingsTab {
+  protected override createPluginSettings(
+    data: unknown
+  ): GitChangelogPluginSettings {
+    return new GitChangelogPluginSettings(data);
+  }
+
+  protected override createPluginSettingsTab(): null | PluginSettingTab {
     return new GitChangelogSettingsTab(this);
   }
 
-  protected override createSettingsManager(): GitChangelogSettingsManager {
-    return new GitChangelogSettingsManager(this);
-  }
+  // Functions below are from obsidian-dev-utils (https://github.com/mnaoumov/obsidian-dev-utils/blob/main/src/obsidian/Plugin/PluginBase.ts)
 
-  // Runs when the plugin is unloaded.
-  // eslint-disable-next-line @typescript-eslint/require-await
-  protected override async onunloadImpl(): Promise<void> {
-    this.debouncedChangelogSettingsChangedCheck?.cancel();
-    this.fileChangelogManager?.taskManager.abort();
-    this.vaultChangelogManager?.taskManager.abort();
-    this.statusBarStats?.destroy();
+  protected override onloadComplete(): void {
+    // Runs when the plugin is unloaded.
+    this.register(() => {
+      this.debouncedChangelogSettingsChangedCheck?.cancel();
+      this.fileChangelogManager?.taskManager.abort();
+      this.vaultChangelogManager?.taskManager.abort();
+      this.statusBarStats?.destroy();
+    });
 
-    if (this.checkpointReminderNotice) {
-      this.checkpointReminderNotice.hide();
-      this.checkpointReminderNotice = undefined;
-    }
-  }
-
-  protected override async onloadImpl(): Promise<void> {
-    await super.onloadImpl();
     this.registerView(VAULT_CHANGELOG_VIEW_CONFIG.type, (leaf) => {
       return new VaultChangelogView(leaf, this);
     });
@@ -242,33 +180,14 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
       return new FileChangelogView(leaf, this);
     });
 
-    this.registerView(COMPARE_TO_CHECKPOINT_VIEW_CONFIG.type, (leaf) => {
-      return new CompareToCheckpointView(leaf, this);
-    });
-
-    this.registerView(COMPARE_REPO_COMMITS_VIEW_CONFIG.type, (leaf) => {
-      return new CompareRepoCommitsView({
-        leaf,
-        plugin: this,
-        utcOlderDate: assertNotNull(this.compareVersionsUtcOlderDate),
-        utcNewerDate: assertNotNull(this.compareVersionsUtcNewerDate)
-      });
-    });
-
     addCommands(this);
 
-    addContextMenuItems(this);
-
     this.debouncedChangelogSettingsChangedCheck = debounce(
       (
-        oldSettings: ReadonlyDeep<
-          ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-        >,
-        newSettings: ReadonlyDeep<
-          ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-        >
+        oldSettings: GitChangelogPluginSettings,
+        newSettings: GitChangelogPluginSettings
       ) => {
-        this.onSaveSettingsCheck(oldSettings, newSettings);
+        this.onSettingsSave(oldSettings, newSettings);
       },
       // eslint-disable-next-line no-magic-numbers
       700,
@@ -277,11 +196,6 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
   }
 
   protected override async onLayoutReady(): Promise<void> {
-    // This is a temporary view, and shouldn't persist between sessions
-    removeCompareVersionsView(this);
-
-    this.localeSafe = getLocaleToAssign(this);
-
     // These have to be initiated first.
     this.vaultChangelogManager = new VaultChangelogManager({
       plugin: this,
@@ -292,12 +206,12 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
       taskManager: new TaskManager(this)
     });
 
-    if (this.settings.showStatusBarStats) {
+    if (this.settings.statusBarStats) {
       this.initStatusBar();
     }
 
     this.registerEvent(
-      this.app.workspace.on('active-leaf-change', () => {
+      this.app.workspace.on('file-open', () => {
         this.updateActiveGitFile();
       })
     );
@@ -309,19 +223,18 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
       })
     );
 
+    // Every 5 minutes it checks if it's a new day in order to update the potentially outdated interval labels.
     this.registerInterval(
       window.setInterval(
         () => {
-          // Every  minute it checks if it's a new hour (most common interval) in order to update the potentially outdated interval labels.
-          const utcCurrentDate = spacetime.now('utc');
-          // Svelte triggers updates only if the strings are different.
-          this.utcCurrentDateHour = formatDateHour(utcCurrentDate);
-
-          // Register minute interval for checkpoint reminders
-          invokeAsyncSafely(() => handleReviewChangesReminderInterval(this));
+          const timezone = getTimeZone(
+            this.settings.changelogGenerationSettings,
+            this
+          );
+          this.currentDay = spacetime.now(timezone).format('day');
         },
         // eslint-disable-next-line no-magic-numbers
-        60 * 1000
+        5 * 60 * 1000
       )
     );
 
@@ -335,19 +248,67 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
       await this.addVaultChangelogView();
       await this.addFileChangelogView();
 
-      await this.settingsManager.editAndSave(
-        (settings: GitChangelogSettings): void => {
-          settings.firstStartup = false;
-        }
-      );
+      const newSettings = this.settingsClone;
+      newSettings.firstStartup = false;
+      await this.saveSettings(newSettings, false);
     }
-
-    // Also checks the status of the Git plugin
     this.updateActiveGitFile();
+
+    // Check status of the Git plugin
+    this.getGitPlugin();
+  }
+
+  /**
+   * Triggers events for the views to listen to instead of updating the changelogs directly from the settings so that if the views aren't active we don't do unnecessary computation.
+   * This allows us to check if relevant settings have changed and only then recompute changelogs, instead of recomputing after every single settings change.
+   */
+  private onSettingsSave(
+    oldSettings: ReadonlyDeep<GitChangelogPluginSettings>,
+    newSettings: GitChangelogPluginSettings
+  ): void {
+    if (
+      changelogGenerationSettingsChanged({
+        newChangelogSettings: newSettings.changelogGenerationSettings,
+        oldChangelogSettings: oldSettings.changelogGenerationSettings,
+        plugin: this
+      })
+    ) {
+      // The main settings, that trigger recalculation for all stats when they change.
+      this.app.workspace.trigger('git-changelog:generation-settings-changed');
+    } else {
+      if (
+        this.fileChangelogManager?.generationSettingsChanged(
+          oldSettings,
+          newSettings
+        ) &&
+        this.cachedActiveGitFile
+      ) {
+        this.app.workspace.trigger(
+          'git-changelog:file-changelog-generation-settings-changed'
+        );
+      }
+      if (
+        this.statusBarStats &&
+        StatusBarStats.generationSettingsChanged(oldSettings, newSettings) &&
+        this.cachedActiveGitFile
+      ) {
+        this.app.workspace.trigger('git-changelog:status-bar-settings-changed');
+      }
+      if (
+        this.vaultChangelogManager?.generationSettingsChanged(
+          oldSettings,
+          newSettings
+        )
+      ) {
+        this.app.workspace.trigger(
+          'git-changelog:vault-changelog-generation-settings-changed'
+        );
+      }
+    }
   }
 
   private setNewActiveGitFile(activeGitFile: string | undefined): void {
-    this.fileChangelogManager?.resetAndGetSignal(); // Does this belong inside the file changelog class?
+    this.fileChangelogManager?.resetAndGetSignal();
     this.cachedActiveGitFile = activeGitFile;
     this.app.workspace.trigger('git-changelog:active-git-file-changed');
   }
@@ -364,83 +325,16 @@ export class GitChangelogPlugin extends PluginBase<GitChangelogPluginTypes> {
 
       if (currentActiveGitFile) {
         this.setNewActiveGitFile(currentActiveGitFile);
-      } else if (
-        !isDiffViewVisible({
-          app: this.app
-        })
-      ) {
-        // If a DiffView is visible, don't clear the active git file, but keep it, so that the file changelog still shows stats for that previously active file.
-        this.setNewActiveGitFile(undefined);
-      }
-    } catch {
-      /* Just do nothing */
-    }
-  }
+      } else {
+        const currentActiveView =
+          this.app.workspace.getActiveViewOfType(ItemView);
 
-  /**
-   * Triggers events for the views to listen to instead of updating the changelogs directly from the settings so that if the views aren't active we don't do unnecessary computation.
-   * This allows us to check if relevant settings have changed and only then recompute changelogs, instead of recomputing after every single settings change.
-   */
-  private onSaveSettingsCheck(
-    oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >
-  ): void {
-    try {
-      if (
-        changelogGenerationSettingsChanged({
-          newSettings,
-          oldSettings
-        })
-      ) {
-        // The main settings, that trigger recalculation for all stats when they change.
-        this.app.workspace.trigger('git-changelog:generation-settings-changed');
-        return;
-      }
-
-      if (
-        this.fileChangelogManager?.specificSettingsChanged(
-          oldSettings,
-          newSettings
-        ) &&
-        this.cachedActiveGitFile
-      ) {
-        this.app.workspace.trigger(
-          'git-changelog:file-changelog-generation-settings-changed'
-        );
-      }
-
-      // Handle destroying and initializing the status bar stats
-      if (this.settings.showStatusBarStats !== !!this.statusBarStats) {
-        const shouldEnableStatusBarStats = this.settings.showStatusBarStats;
-        if (shouldEnableStatusBarStats) {
-          this.initStatusBar();
-        } else {
-          this.statusBarStats?.destroy?.();
-          this.statusBarStats = undefined;
+        // If a DiffView is active, don't clear the active git file, but keep it, so that the file changelog still shows stats for that previously active file. Only works if the diff view is also focused.
+        if (isDiffView(currentActiveView)) {
+          return;
         }
-      }
-      // Handle status bar settings changes
-      else if (
-        this.statusBarStats &&
-        StatusBarStats.generationSettingsChanged(oldSettings, newSettings) &&
-        this.cachedActiveGitFile
-      ) {
-        this.app.workspace.trigger('git-changelog:status-bar-settings-changed');
-      }
 
-      if (
-        this.vaultChangelogManager?.specificSettingsChanged(
-          oldSettings,
-          newSettings
-        )
-      ) {
-        this.app.workspace.trigger(
-          'git-changelog:vault-changelog-generation-settings-changed'
-        );
+        this.setNewActiveGitFile(undefined);
       }
     } catch {
       /* Empty */

src/TaskManager.svelte.ts

@@ -5,8 +5,7 @@ import {
   addToQueueAndWait
 } from 'obsidian-dev-utils/obsidian/Queue';
 
-// Obsidian default behavior is to timeout long running tasks after 60 seconds
-export const GIT_OPERATION_TIMEOUT_MILLISECONDS = 59_000;
+export const GIT_OPERATION_TIMEOUT_MILLISECONDS = 80_000;
 
 export class TaskManager {
   public queueSize = $state(0);

src/Views/CompareRepoCommits/CompareModal.ts

@@ -1,154 +0,0 @@
-import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
-import type { PromiseResolve } from 'obsidian-dev-utils/Async';
-import type { ModalOptionsBase } from 'obsidian-dev-utils/obsidian/Modals/ModalBase';
-import type { CompareRepoCommitsViewState } from 'types.ts';
-
-import { ButtonComponent, moment } from 'obsidian';
-import { CssClass } from 'obsidian-dev-utils/CssClass';
-import { ModalBase } from 'obsidian-dev-utils/obsidian/Modals/ModalBase';
-import { SettingEx } from 'obsidian-dev-utils/obsidian/SettingEx';
-import { assertNotNull } from 'utils.ts';
-
-export class CompareVersionsModal extends ModalBase<
-  CompareRepoCommitsViewState | undefined,
-  ModalOptionsBase
-> {
-  public plugin: GitChangelogPlugin;
-
-  // Date-time component automatically converts dates to the system timezone in the UI and stores them as UTC
-  private utcOlderDate: Date | undefined;
-  private utcNewerDate: Date;
-  private compareRepoCommitsViewEphemeralState:
-    | CompareRepoCommitsViewState
-    | undefined;
-
-  public constructor({
-    options,
-    resolve,
-    modalCssClass,
-    plugin,
-    utcOlderDateString,
-    utcNewerDateString
-  }: {
-    options: ModalOptionsBase;
-    resolve: PromiseResolve<CompareRepoCommitsViewState | undefined>;
-    modalCssClass: string;
-    plugin: GitChangelogPlugin;
-    utcOlderDateString: string | undefined;
-    utcNewerDateString: string | undefined;
-  }) {
-    super(options, resolve, modalCssClass);
-    this.plugin = plugin;
-
-    // Load the newer date from the previous modal or if this is the first time the user is comparing in this Obsidian session then assign the current date
-    this.utcNewerDate = utcNewerDateString
-      ? new Date(utcNewerDateString)
-      : new Date();
-    if (utcOlderDateString) {
-      this.utcOlderDate = new Date(utcOlderDateString);
-    }
-  }
-
-  public override onClose(): void {
-    super.onClose();
-
-    this.resolve(this.compareRepoCommitsViewEphemeralState);
-  }
-
-  public override onOpen(): void {
-    super.onOpen();
-    this.contentEl.addClass('git-changelog-checkpoint-modal');
-
-    const titleElement = new SettingEx(this.contentEl);
-    titleElement.setName('Compare two vault states in git history');
-    titleElement.setDesc(
-      createFragment((fragment) => {
-        fragment.appendText(
-          `The nearest commit that came before the each specified date will be used.`
-        );
-        fragment.createEl('br');
-        fragment.appendText(
-          `Specify the dates in your system timezone (not the one configured in the plugin settings).`
-        );
-      })
-    );
-
-    this.createTimeInput({
-      text: 'Newer date',
-      onChange: (value) => {
-        this.utcNewerDate = value;
-      },
-      startValue: this.utcNewerDate
-    });
-
-    this.createTimeInput({
-      text: 'Older date',
-      onChange: (value) => {
-        this.utcOlderDate = value;
-      },
-      startValue: this.utcOlderDate
-    });
-
-    this.createCompareButton();
-  }
-
-  private createTimeInput({
-    onChange,
-    text,
-    startValue
-  }: {
-    onChange: (value: Date) => void;
-    text: string;
-    startValue: Date | undefined;
-  }): void {
-    const setting = new SettingEx(this.contentEl);
-
-    setting.setName(text).addDateTime((dateTime) => {
-      if (startValue) {
-        dateTime.setValue(startValue);
-      }
-      dateTime.onChange(onChange);
-    });
-  }
-
-  private validateDates(): string | undefined {
-    if (!this.utcOlderDate || !this.utcNewerDate) {
-      return 'Both dates must be selected.';
-    }
-
-    // Try parsing both dates
-    if (!moment.isDate(this.utcOlderDate)) {
-      return 'Invalid start date.';
-    }
-    if (!moment.isDate(this.utcNewerDate)) {
-      return 'Invalid end date.';
-    }
-
-    // Check if the older date is before the newer date
-    return this.utcOlderDate < this.utcNewerDate
-      ? undefined
-      : 'Older date must be before the newer date.';
-  }
-
-  private createCompareButton(): void {
-    const approveButton = new ButtonComponent(this.contentEl);
-    approveButton.setButtonText('Compare');
-    approveButton.setCta();
-    approveButton.onClick(() => {
-      const validationMessage = this.validateDates();
-
-      if (validationMessage) {
-        this.plugin.displayNotice(validationMessage);
-      } else {
-        //  Input dates are in UTC, so that git can process them accurately.
-        this.compareRepoCommitsViewEphemeralState = {
-          utcOlderDate: assertNotNull(this.utcOlderDate).toISOString(),
-          utcNewerDate: this.utcNewerDate.toISOString()
-        };
-
-        this.close();
-      }
-    });
-    approveButton.setClass(CssClass.OkButton);
-  }
-}

src/Views/CompareRepoCommits/CompareRepoCommits.svelte

@@ -1,212 +0,0 @@
-<script lang="ts">
-  import type { VaultChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
-  import type GitChangelogPlugin from 'main.ts';
-
-  import {
-    COMPARED_VERSIONS_DATE_SEPARATOR_ICON,
-    COPY_COMMIT_HASH_ICON,
-    TOGGLE_FILES_SUMMARY_OPTION_ICON
-  } from 'constants.ts';
-  import { findFirstCommitBefore } from 'core/gitOperations/findFirstCommitBefore.ts';
-  import { runRepoDiff } from 'core/gitOperations/runRepoDiff.ts';
-  import { setIcon } from 'obsidian';
-  import { CssClass } from 'obsidian-dev-utils/CssClass';
-  import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
-  import { onDestroy, onMount } from 'svelte';
-  import { FileSummariesDisplayMode } from 'types.ts';
-  import { assertNotNull } from 'utils.ts';
-  import DependenciesStatusCheck from 'Views/components/DependenciesStatusCheck.svelte';
-  import { formatFullDate } from 'Views/formatters.ts';
-  import VersionComponent from 'Views/VaultChangelog/components/Version.svelte';
-
-  // eslint-disable-next-line capitalized-comments
-  // svelte-ignore non_reactive_update
-  enum CompareVersionsState {
-    Loading = 'Loading...',
-    OnCheckpointCommit = 'Specified dates fall inside the same commit.',
-    BeforeInitialCommit = 'Both dates are before the initial commit.',
-    NoChanges = 'The versions are the same.',
-    Loaded = 'Loaded',
-    UnknownError = 'Unknown error occurred.'
-  }
-
-  interface Properties {
-    plugin: GitChangelogPlugin;
-    closeView: () => void;
-    utcOlderDate: string;
-    utcNewerDate: string;
-  }
-
-  const { plugin, closeView, utcOlderDate, utcNewerDate }: Properties =
-    $props();
-
-  let filesSummaryDisplayModeButton = $state<HTMLElement>();
-  let version = $state<VaultChangelogEntry>();
-  let timezoneAdjustedOlderDate = $state<string>();
-  let timezoneAdjustedNewerDate = $state<string>();
-
-  let compareVersionsState = $state<CompareVersionsState>(
-    CompareVersionsState.Loading
-  );
-
-  const showFilesCountSummariesMode = FileSummariesDisplayMode.TextAndBinary;
-
-  let arrowIconElement = $state<HTMLElement>();
-  let sameCommitIconElement = $state<HTMLElement>();
-
-  onMount(async () => {
-    try {
-      const git = await plugin.getGit();
-      const timeZone = getTimeZone(plugin);
-
-      const upperCommit = await findFirstCommitBefore({
-        abortSignal: new AbortController().signal,
-        isoString: utcNewerDate,
-        git,
-        timeZone
-      });
-      if (!upperCommit) {
-        // Since the newer date must be newer than the older date and the newer date is already older than the first commit, that means both dates belong to the time before the repository was created and therefore when comparing the state of the repository between these two dates, the state is the same: non-existent.
-        compareVersionsState = CompareVersionsState.BeforeInitialCommit;
-        return;
-      }
-
-      let lowerCommitIsEmptyTree = false;
-      let lowerCommit = await findFirstCommitBefore({
-        abortSignal: new AbortController().signal,
-        isoString: utcOlderDate,
-        git,
-        timeZone
-      });
-      if (!lowerCommit) {
-        lowerCommitIsEmptyTree = true;
-
-        lowerCommit = {
-          hash: await plugin.getEmptyTreeHash(),
-          // This date won't be used in this scenario, so we can set it to anything.
-          timeZoneAdjustedDate: upperCommit.timeZoneAdjustedDate
-        };
-      }
-
-      timezoneAdjustedNewerDate = formatFullDate(
-        upperCommit.timeZoneAdjustedDate.toNativeDate(),
-        plugin.localeSafe,
-        getTimeZone(plugin)
-      );
-
-      if (lowerCommit.hash === upperCommit.hash) {
-        compareVersionsState = CompareVersionsState.OnCheckpointCommit;
-        // Show the single date of the commit if this is the case
-        return;
-      }
-
-      // Potentially indicate that we're comparing to empty state because the provided older date is older than the repository
-      timezoneAdjustedOlderDate = lowerCommitIsEmptyTree
-        ? 'Beginning'
-        : formatFullDate(
-            lowerCommit.timeZoneAdjustedDate.toNativeDate(),
-            plugin.localeSafe,
-            getTimeZone(plugin)
-          );
-
-      version = await runRepoDiff({
-        git,
-        oldCommit: lowerCommit,
-        newCommit: upperCommit,
-        abortSignal: new AbortController().signal,
-        convertToIncludeList: plugin.settings.convertToIncludeList,
-        diffAlgorithm: plugin.settings.diffAlgorithm,
-        excludeFilesAndFoldersLines:
-          plugin.settings.excludeFilesAndFoldersLines,
-        enableExclusionList: plugin.settings.enableExclusionList,
-        ignoreBlankLines: plugin.settings.ignoreBlankLines,
-        renameDetectionStrictness: plugin.settings.renameDetectionStrictness,
-        renameLimit: plugin.settings.renameLimit,
-        whitespaceIgnoreMode: plugin.settings.whitespaceIgnoreMode,
-        emptyTreeHash: await plugin.getEmptyTreeHash(),
-        plugin
-      });
-
-      // If you pass identical commit hashes to git diff, or if there are no changes, it will just output nothing.
-      compareVersionsState = version
-        ? CompareVersionsState.Loaded
-        : CompareVersionsState.NoChanges;
-    } catch {
-      compareVersionsState = CompareVersionsState.UnknownError;
-    }
-  });
-
-  $effect(() => {
-    if (arrowIconElement) {
-      setIcon(arrowIconElement, COMPARED_VERSIONS_DATE_SEPARATOR_ICON);
-    }
-
-    if (sameCommitIconElement) {
-      setIcon(sameCommitIconElement, COPY_COMMIT_HASH_ICON);
-    }
-
-    if (filesSummaryDisplayModeButton) {
-      setIcon(filesSummaryDisplayModeButton, TOGGLE_FILES_SUMMARY_OPTION_ICON);
-    }
-  });
-
-  onDestroy(() => {
-    filesSummaryDisplayModeButton = undefined;
-    arrowIconElement = undefined;
-    sameCommitIconElement = undefined;
-  });
-</script>
-
-<div class="git-changelog-view">
-  <div class="nav-header git-changelog-force-center">
-    <div class="nav-buttons-container git-changelog-top-margin">
-      <button type="button" class={CssClass.OkButton} onclick={closeView}>
-        Exit comparison
-      </button>
-    </div>
-  </div>
-  <DependenciesStatusCheck {plugin}>
-    <div class="git-changelog-compared-versions-container">
-      {#if timezoneAdjustedOlderDate && (compareVersionsState === CompareVersionsState.Loaded || compareVersionsState === CompareVersionsState.NoChanges)}
-        <div class="git-changelog-compared-version-title">
-          {timezoneAdjustedOlderDate}
-        </div>
-        <span
-          class="git-changelog-compared-version-title-arrow icon git-changelog-stat-color"
-          bind:this={arrowIconElement}
-        ></span>
-      {/if}
-      <div class="git-changelog-compared-version-title">
-        <!-- ' ' because it serves as a space placeholder -->
-        {timezoneAdjustedNewerDate &&
-        compareVersionsState !== CompareVersionsState.Loading &&
-        compareVersionsState !== CompareVersionsState.UnknownError
-          ? timezoneAdjustedNewerDate
-          : '　'}
-      </div>
-    </div>
-    <div class="nav-files-container">
-      {#if compareVersionsState === CompareVersionsState.Loaded}
-        <VersionComponent
-          version={assertNotNull(version)}
-          {plugin}
-          hideTitleAndMakeUncollapsible={true}
-          showFilesCountSummaries={showFilesCountSummariesMode}
-        />
-      {:else}
-        <div class="pane-empty git-changelog-git-issue">
-          {#if compareVersionsState === CompareVersionsState.OnCheckpointCommit}
-            <span
-              class="icon git-changelog-on-checkpoint-commit-icon"
-              bind:this={sameCommitIconElement}
-            ></span>
-          {/if}
-          {compareVersionsState}
-        </div>
-      {/if}
-    </div>
-  </DependenciesStatusCheck>
-</div>
-
-<style lang="scss">
-</style>

src/Views/CompareRepoCommits/CompareRepoCommits.ts

@@ -1,87 +0,0 @@
-import type GitChangelogPlugin from 'main.ts';
-import type { WorkspaceLeaf } from 'obsidian';
-import type { CompareRepoCommitsViewState } from 'types.ts';
-
-import { COMPARE_REPO_COMMITS_VIEW_CONFIG } from 'constants.ts';
-import { ItemView } from 'obsidian';
-import { mount, unmount } from 'svelte';
-import { removeCompareVersionsView } from 'utils.ts';
-import CompareRepoCommitsComponent from 'Views/CompareRepoCommits/CompareRepoCommits.svelte';
-import { registerCloseViewIfDeferred } from 'Views/helper.ts';
-
-export class CompareRepoCommitsView
-  extends ItemView
-  implements CompareRepoCommitsViewState
-{
-  public plugin: GitChangelogPlugin;
-  public utcOlderDate: string;
-  public utcNewerDate: string;
-  private _view: CompareRepoCommitsComponent | undefined = undefined;
-
-  public constructor({
-    leaf,
-    plugin,
-    utcOlderDate,
-    utcNewerDate
-  }: {
-    leaf: WorkspaceLeaf;
-    plugin: GitChangelogPlugin;
-    utcOlderDate: string;
-    utcNewerDate: string;
-  }) {
-    super(leaf);
-    this.plugin = plugin;
-    this.utcOlderDate = utcOlderDate;
-    this.utcNewerDate = utcNewerDate;
-
-    this.navigation = false;
-  }
-
-  public async destroy(): Promise<void> {
-    if (this._view) {
-      await unmount(this._view);
-      this._view = undefined;
-    }
-  }
-
-  public override getDisplayText(): string {
-    return COMPARE_REPO_COMMITS_VIEW_CONFIG.name;
-  }
-
-  public override getIcon(): string {
-    return COMPARE_REPO_COMMITS_VIEW_CONFIG.icon;
-  }
-
-  public override getViewType(): string {
-    return COMPARE_REPO_COMMITS_VIEW_CONFIG.type;
-  }
-
-  public override async onClose(): Promise<void> {
-    await this.destroy();
-    return super.onClose();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/require-await
-  public override async onOpen(): Promise<void> {
-    this._view = mount(CompareRepoCommitsComponent, {
-      props: {
-        plugin: this.plugin,
-        closeView: () => {
-          // Await this.close();
-          removeCompareVersionsView(this.plugin);
-        },
-        utcOlderDate: this.utcOlderDate,
-        utcNewerDate: this.utcNewerDate
-      },
-      target: this.contentEl
-    }) as CompareRepoCommitsComponent;
-
-    registerCloseViewIfDeferred(this, this.plugin);
-  }
-
-  public override onunload(): void {
-    super.onunload();
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.destroy();
-  }
-}

src/Views/CompareToCheckpoint/CompareToCheckpoint.svelte

@@ -1,276 +0,0 @@
-<script lang="ts">
-  import type { VaultChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
-  import type GitChangelogPlugin from 'main.ts';
-  import type { GitChangelogSettings } from 'settings/settings.ts';
-
-  import {
-    COMPARED_VERSIONS_DATE_SEPARATOR_ICON,
-    COPY_COMMIT_HASH_ICON,
-    TOGGLE_FILES_SUMMARY_OPTION_ICON
-  } from 'constants.ts';
-  import { getCommitTimestampOrUndefined } from 'core/gitOperations/getCommitTimestamp.ts';
-  import { runRepoDiff } from 'core/gitOperations/runRepoDiff.ts';
-  import { setIcon } from 'obsidian';
-  import { CssClass } from 'obsidian-dev-utils/CssClass';
-  import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
-  import { onDestroy, onMount } from 'svelte';
-  import { FileSummariesDisplayMode } from 'types.ts';
-  import { assertNotNull } from 'utils.ts';
-  import DependenciesStatusCheck from 'Views/components/DependenciesStatusCheck.svelte';
-  import { formatFullDate } from 'Views/formatters.ts';
-  import VersionComponent from 'Views/VaultChangelog/components/Version.svelte';
-
-  // eslint-disable-next-line capitalized-comments
-  // svelte-ignore non_reactive_update
-  enum ModalCheckpointState {
-    Loading = 'Loading...',
-    OnCheckpointCommit = 'No commits occurred since the last checkpoint.',
-    NoCommits = 'No commits in the repository.',
-    NoCheckpoints = 'No checkpoints yet.',
-    CheckpointCommitNoLongerExists = 'The commit tied to the last checkpoint no longer exists or the checkpoint value is corrupted.',
-    NoChanges = 'No committed included changes since the last checkpoint.',
-    Loaded = 'Loaded',
-    UnknownError = 'Unknown error occurred.'
-  }
-
-  interface Properties {
-    plugin: GitChangelogPlugin;
-    closeView: () => void;
-  }
-
-  const { plugin, closeView }: Properties = $props();
-
-  let filesSummaryDisplayModeButton = $state<HTMLElement>();
-  let version = $state<VaultChangelogEntry>();
-  let startingCheckpointDate = $state<string>();
-  let latestStateDate = $state<string>();
-
-  let upperCommitHash: string | undefined;
-  let modalCheckpointState = $state<ModalCheckpointState>(
-    ModalCheckpointState.Loading
-  );
-  let approveButtonText = $state<string>('Loading...');
-  let setCta = $state<boolean>(false);
-  let showFilesCountSummariesMode = $state(
-    FileSummariesDisplayMode.TextAndBinary
-  );
-
-  let arrowIconElement = $state<HTMLElement>();
-  let onCheckpointCommitIconElement = $state<HTMLElement>();
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  function toggleFilesSummaryOption(): void {
-    showFilesCountSummariesMode =
-      showFilesCountSummariesMode === FileSummariesDisplayMode.Total
-        ? FileSummariesDisplayMode.TextAndBinary
-        : FileSummariesDisplayMode.Total;
-  }
-
-  async function onApproveButtonClick(event: MouseEvent): Promise<void> {
-    event.stopPropagation();
-
-    // UpperCommitHash could be cleaned up
-    const checkpointToSave = upperCommitHash;
-    closeView();
-
-    if (checkpointToSave) {
-      await plugin.settingsManager.editAndSave(
-        (settings: GitChangelogSettings): void => {
-          // We only save the latest commit as a new checkpoint if the user closes the temporary view by clicking "approve".
-          // Otherwise we don't change anything.
-          settings.checkpointCommits.push(checkpointToSave);
-        }
-      );
-    }
-  }
-
-  onMount(async () => {
-    try {
-      const git = await plugin.getGit();
-
-      const upperCommit = await getCommitTimestampOrUndefined({
-        abortSignal: new AbortController().signal,
-        git,
-        timeZone: getTimeZone(plugin)
-      });
-      if (!upperCommit) {
-        // If the repo has no commits, git will throw this error:
-        // "Fatal: your current branch 'main' does not have any commits yet"
-        // And the upperCommit will be undefined.
-        modalCheckpointState = ModalCheckpointState.NoCommits;
-        approveButtonText = 'Close';
-
-        // Don't show approve button, because if upperCommit doesn't exist, then that means there are no commits in the repo, so we don't have anything to save as a checkpoint anyway.
-        return;
-      }
-
-      // Save this because if the user clicks "approve" we need to register the latest commit as the latest checkpoint.
-      //  We can't depend on the version.commitHash because version might not get computed in certain states (most common scenario is when there are no previous checkpoints).
-      upperCommitHash = upperCommit.hash;
-
-      const lowerCommitHash = plugin.settings.checkpointCommits.at(-1);
-      if (!lowerCommitHash) {
-        // There are no checkpoints to compare to.
-        modalCheckpointState = ModalCheckpointState.NoCheckpoints;
-
-        setCta = true;
-        approveButtonText = 'Create first checkpoint';
-        return;
-      }
-
-      if (lowerCommitHash === upperCommit.hash) {
-        modalCheckpointState = ModalCheckpointState.OnCheckpointCommit;
-
-        // Do not show the "approve" button because there is no point in registering the same commit as the last checkpoint.
-        approveButtonText = 'Close';
-
-        // Show the date of the latest commit if this is the case
-        latestStateDate = formatFullDate(
-          upperCommit.timeZoneAdjustedDate.toNativeDate(),
-          plugin.localeSafe,
-          getTimeZone(plugin)
-        );
-        return;
-      }
-
-      const lowerCommit = await getCommitTimestampOrUndefined({
-        abortSignal: new AbortController().signal,
-        commitHash: lowerCommitHash,
-        git,
-        timeZone: getTimeZone(plugin)
-      });
-
-      if (!lowerCommit) {
-        // The passed commit hash was corrupted (that's possible because it's read from data.json) or the commit no longer exists (is deleted from repo).
-        // If it's some other error like GitPluginMissingError, then that will be handled and displayed over this in DependenciesStatusCheck anyway, so it doesn't need to be accurate here
-        modalCheckpointState =
-          ModalCheckpointState.CheckpointCommitNoLongerExists;
-
-        setCta = true;
-        approveButtonText = 'Create new checkpoint';
-        return;
-      }
-
-      startingCheckpointDate = formatFullDate(
-        lowerCommit.timeZoneAdjustedDate.toNativeDate(),
-        plugin.localeSafe,
-        getTimeZone(plugin)
-      );
-
-      version = await runRepoDiff({
-        git,
-        oldCommit: lowerCommit,
-        newCommit: upperCommit,
-        abortSignal: new AbortController().signal,
-        convertToIncludeList: plugin.settings.convertToIncludeList,
-        diffAlgorithm: plugin.settings.diffAlgorithm,
-        excludeFilesAndFoldersLines:
-          plugin.settings.excludeFilesAndFoldersLines,
-        ignoreBlankLines: plugin.settings.ignoreBlankLines,
-        enableExclusionList: plugin.settings.enableExclusionList,
-        renameDetectionStrictness: plugin.settings.renameDetectionStrictness,
-        renameLimit: plugin.settings.renameLimit,
-        whitespaceIgnoreMode: plugin.settings.whitespaceIgnoreMode,
-        emptyTreeHash: await plugin.getEmptyTreeHash(),
-        plugin
-      });
-
-      latestStateDate = formatFullDate(
-        upperCommit.timeZoneAdjustedDate.toNativeDate(),
-        plugin.localeSafe,
-        getTimeZone(plugin)
-      );
-
-      // If you pass identical commit hashes to git diff, or if there are no changes, it will just output nothing.
-      modalCheckpointState = version
-        ? ModalCheckpointState.Loaded
-        : ModalCheckpointState.NoChanges;
-
-      setCta = true;
-      approveButtonText = 'Create new checkpoint';
-    } catch {
-      modalCheckpointState = ModalCheckpointState.UnknownError;
-      approveButtonText = 'Close';
-    }
-  });
-
-  $effect(() => {
-    if (arrowIconElement) {
-      setIcon(arrowIconElement, COMPARED_VERSIONS_DATE_SEPARATOR_ICON);
-    }
-
-    if (onCheckpointCommitIconElement) {
-      setIcon(onCheckpointCommitIconElement, COPY_COMMIT_HASH_ICON);
-    }
-
-    if (filesSummaryDisplayModeButton) {
-      setIcon(filesSummaryDisplayModeButton, TOGGLE_FILES_SUMMARY_OPTION_ICON);
-    }
-  });
-
-  onDestroy(() => {
-    filesSummaryDisplayModeButton = undefined;
-    arrowIconElement = undefined;
-    onCheckpointCommitIconElement = undefined;
-  });
-</script>
-
-<div class="git-changelog-view">
-  <!-- {#if !compactMode} -->
-  <div class="nav-header git-changelog-force-center">
-    <div class="nav-buttons-container git-changelog-top-margin">
-      <button
-        type="submit"
-        disabled={modalCheckpointState === ModalCheckpointState.Loading}
-        class={`${setCta ? 'mod-cta ' : ''}${CssClass.OkButton}`}
-        onclick={onApproveButtonClick}
-      >
-        {approveButtonText}
-      </button>
-    </div>
-  </div>
-  <DependenciesStatusCheck {plugin}>
-    <div class="git-changelog-compared-versions-container">
-      {#if startingCheckpointDate && (modalCheckpointState === ModalCheckpointState.Loaded || modalCheckpointState === ModalCheckpointState.NoChanges)}
-        <div class="git-changelog-compared-version-title">
-          {startingCheckpointDate}
-        </div>
-        <span
-          class="git-changelog-compared-version-title-arrow icon git-changelog-stat-color"
-          bind:this={arrowIconElement}
-        ></span>
-      {/if}
-      <div class="git-changelog-compared-version-title">
-        <!-- ' ' because it serves as a space placeholder -->
-        {latestStateDate &&
-        modalCheckpointState !== ModalCheckpointState.Loading &&
-        modalCheckpointState !== ModalCheckpointState.UnknownError
-          ? latestStateDate
-          : '　'}
-      </div>
-    </div>
-    <div class="nav-files-container">
-      {#if modalCheckpointState === ModalCheckpointState.Loaded}
-        <VersionComponent
-          version={assertNotNull(version)}
-          {plugin}
-          hideTitleAndMakeUncollapsible={true}
-          showFilesCountSummaries={showFilesCountSummariesMode}
-        />
-      {:else}
-        <div class="pane-empty git-changelog-git-issue">
-          {#if modalCheckpointState === ModalCheckpointState.OnCheckpointCommit}
-            <span
-              class="icon git-changelog-on-checkpoint-commit-icon"
-              bind:this={onCheckpointCommitIconElement}
-            ></span>
-          {/if}
-          {modalCheckpointState}
-        </div>
-      {/if}
-    </div>
-  </DependenciesStatusCheck>
-</div>
-
-<style lang="scss">
-</style>

src/Views/CompareToCheckpoint/CompareToCheckpoint.ts

@@ -1,70 +0,0 @@
-import type GitChangelogPlugin from 'main.ts';
-import type { WorkspaceLeaf } from 'obsidian';
-
-import { COMPARE_TO_CHECKPOINT_VIEW_CONFIG } from 'constants.ts';
-import { ItemView } from 'obsidian';
-import { mount, unmount } from 'svelte';
-import { removeCompareVersionsView } from 'utils.ts';
-import CompareToCheckpointComponent from 'Views/CompareToCheckpoint/CompareToCheckpoint.svelte';
-import { registerCloseViewIfDeferred } from 'Views/helper.ts';
-
-/**
- * This was originally a modal, but user should also be able to click on the changes to inspect them, so it was migrated to a temporary view.
- */
-export class CompareToCheckpointView extends ItemView {
-  public plugin: GitChangelogPlugin;
-  private _view: CompareToCheckpointComponent | undefined = undefined;
-
-  public constructor(leaf: WorkspaceLeaf, plugin: GitChangelogPlugin) {
-    super(leaf);
-    this.plugin = plugin;
-    this.navigation = false;
-    // This.closeable = true;
-  }
-
-  public async destroy(): Promise<void> {
-    if (this._view) {
-      await unmount(this._view);
-      this._view = undefined;
-    }
-  }
-
-  public override getDisplayText(): string {
-    return COMPARE_TO_CHECKPOINT_VIEW_CONFIG.name;
-  }
-
-  public override getIcon(): string {
-    return COMPARE_TO_CHECKPOINT_VIEW_CONFIG.icon;
-  }
-
-  public override getViewType(): string {
-    return COMPARE_TO_CHECKPOINT_VIEW_CONFIG.type;
-  }
-
-  public override async onClose(): Promise<void> {
-    await this.destroy();
-    return super.onClose();
-  }
-
-  // eslint-disable-next-line @typescript-eslint/require-await
-  public override async onOpen(): Promise<void> {
-    this._view = mount(CompareToCheckpointComponent, {
-      props: {
-        plugin: this.plugin,
-        closeView: () => {
-          // Await this.close();
-          removeCompareVersionsView(this.plugin);
-        }
-      },
-      target: this.contentEl
-    }) as CompareToCheckpointComponent;
-
-    registerCloseViewIfDeferred(this, this.plugin);
-  }
-
-  public override onunload(): void {
-    super.onunload();
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.destroy();
-  }
-}

src/Views/FileChangelog/FileChangelog.svelte

@@ -2,12 +2,8 @@
   import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
   import type { EventRef } from 'obsidian';
 
-  import { INFO_TOOLTIP_ICON } from 'constants.ts';
-  import { runCheckIgnore } from 'core/gitOperations/runCheckIgnore.ts';
-  import { setIcon } from 'obsidian';
   import { onDestroy, untrack } from 'svelte';
   import { LoaderState } from 'svelte-infinite';
-  import { assertNotNull } from 'utils.ts';
   import ChangeIntervalButton from 'Views/components/ChangeIntervalButton.svelte';
   import DependenciesStatusCheck from 'Views/components/DependenciesStatusCheck.svelte';
   import InfiniteScroller from 'Views/components/InfiniteScroller.svelte';
@@ -34,14 +30,12 @@
   let settingsChangedReference: EventRef;
   let activeFileChangedReference: EventRef;
 
-  let infoTooltipIcon = $state<HTMLElement>();
-
   const changelogManager = $derived(plugin.fileChangelogManager);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
   const loaderState = new LoaderState();
   let intervalAdjective = $state<string>();
 
-  let changelogState = $derived.by(() => {
+  const changelogState = $derived.by(() => {
     if (!changelogManager) {
       return FileChangelogState.Initializing;
     }
@@ -62,43 +56,10 @@
     if (!plugin.cachedActiveGitFile) {
       return FileChangelogState.NoMarkdownFileOpen;
     }
-    //
-    untrack(() => {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      checkFileInGitIgnore();
-    });
-    // Set a loading state while checkFileInGitIgnore is in progress
-    return FileChangelogState.Recomputing;
+
+    return FileChangelogState.EmptyHistory;
   });
 
-  // Const fileInGitIgnore = $state<boolean>();
-
-  // If the file git log yielded no entries, check if it's because the file is ignored by git, or if it's just a new file with no history. Should be instant so no visible UI mismatch.
-  async function checkFileInGitIgnore(): Promise<void> {
-    if (!plugin.cachedActiveGitFile || !changelogManager) {
-      return;
-    }
-    const abortSignal = changelogManager.taskManager.getAbortSignal();
-    const cachedActiveGitFile = plugin.cachedActiveGitFile;
-
-    await changelogManager.taskManager.enqueueAndWait(async () => {
-      try {
-        const git = await plugin.getGit();
-        const isIgnored = await runCheckIgnore({
-          abortSignal,
-          activeGitFile: cachedActiveGitFile,
-          git
-        });
-
-        changelogState = isIgnored
-          ? FileChangelogState.GitIgnoredFileOpen
-          : FileChangelogState.EmptyHistory;
-      } catch {
-        changelogState = FileChangelogState.EmptyHistory;
-      }
-    });
-  }
-
   let fileChangelogSettingsChangedReference: EventRef;
 
   headChangeReference = plugin.app.workspace.on(
@@ -138,15 +99,6 @@
     }
   });
 
-  $effect(() => {
-    if (infoTooltipIcon) {
-      setIcon(
-        infoTooltipIcon,
-        assertNotNull(infoTooltipIcon.getAttr('data-icon'))
-      );
-    }
-  });
-
   $effect.pre(() => {
     setIntervalAdjective();
   });
@@ -175,8 +127,7 @@
       <ChangeIntervalButton
         {changelogManager}
         enabled={changelogState !== FileChangelogState.Initializing &&
-          plugin.dependenciesReady === true &&
-          !!plugin.cachedActiveGitFile}
+          plugin.dependenciesReady === true}
       ></ChangeIntervalButton>
     </div>
   </div>
@@ -186,15 +137,17 @@
   <DependenciesStatusCheck {plugin}>
     <div class="nav-files-container">
       {#if changelogState === FileChangelogState.HasEntries}
+        <!-- eslint-disable-next-line @typescript-eslint/no-non-null-assertion -->
         <InfiniteScroller
           {loaderState}
-          triggerLoad={assertNotNull(changelogManager).handleScroll}
+          triggerLoad={// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          changelogManager!.handleScroll}
         >
-          {#each assertNotNull(assertNotNull(changelogManager).visibleEntries) as entry, index (entry.commitHash)}
+          <!-- eslint-disable-next-line @typescript-eslint/no-non-null-assertion -->
+          {#each changelogManager!.visibleEntries! as entry, index (entry.commitHash)}
             <Version
-              previousEntry={assertNotNull(
-                assertNotNull(changelogManager).visibleEntries
-              ).at(index + 1)}
+              previousEntry={// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+              changelogManager!.visibleEntries!.at(index + 1)}
               {entry}
               {plugin}
               {index}
@@ -207,27 +160,9 @@
           Loading {intervalAdjective} versions...
         </div>
       {:else if changelogState === FileChangelogState.NoMarkdownFileOpen}
-        <div class="pane-empty">No file opened.</div>
+        <div class="pane-empty">No markdown file opened.</div>
       {:else if changelogState === FileChangelogState.EmptyHistory}
-        <div class="pane-empty">
-          <div>File has no Git history.</div>
-          <div class="git-changelog-row">
-            <div
-              bind:this={infoTooltipIcon}
-              data-icon={INFO_TOOLTIP_ICON}
-              aria-label="Due to Git limitations, it doesn't show the history of files that had their:
-            1. file path changed without the changes being committed.
-            2. file path changes be capitalization changes only."
-              class="icon git-changelog-tooltip-icon"
-            ></div>
-            <a
-              href="https://github.com/shumadrid/obsidian-git-changelog?tab=readme-ov-file#faq"
-              class="external-link git-changelog-read-more">Read more</a
-            >
-          </div>
-        </div>
-      {:else if changelogState === FileChangelogState.GitIgnoredFileOpen}
-        <div class="pane-empty">File is ignored by Git.</div>
+        <div class="pane-empty">File has no Git history.</div>
       {/if}
       <!-- if changelogState === FileChangelogState.Initializing, show nothing -->
     </div>
@@ -235,18 +170,4 @@
 </div>
 
 <style lang="scss">
-  .git-changelog-tooltip-icon {
-    margin-top: var(--size-4-1);
-  }
-
-  .git-changelog-read-more {
-    font-size: var(--font-small);
-  }
-
-  .git-changelog-row {
-    display: flex;
-    gap: var(--size-4-1);
-    align-items: center;
-    justify-content: center;
-  }
 </style>

src/Views/FileChangelog/FileChangelog.ts

@@ -58,7 +58,6 @@ export class FileChangelogView extends ItemView {
   }
 
   public override onunload(): void {
-    super.onunload();
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.destroy();
   }

src/Views/FileChangelog/Version.svelte

@@ -3,13 +3,9 @@
   import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
 
   import { OPEN_FILE_ICON } from 'constants.ts';
-  import { mayTriggerChangelogMenu } from 'menu.ts';
   import { setIcon } from 'obsidian';
-  import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
   import { DiffFileStatus } from 'types.ts';
-  import { assertNotNull } from 'utils.ts';
   import DiffStatsComponent from 'Views/components/DiffStats.svelte';
-  import { FileChangelogView } from 'Views/FileChangelog/FileChangelog.ts';
   import { composeAriaLabel, composeVersionTitle } from 'Views/formatters.ts';
   import {
     canOpenInDiffView,
@@ -27,27 +23,14 @@
 
   let openFileButton = $state<HTMLElement>();
 
-  const formattedVersionDateLabel = $derived.by(() => {
-    const currentDate = plugin.utcCurrentDateHour;
-    const locale = plugin.localeSafe;
-    return composeVersionTitle({
-      interval: plugin.settings.fileChangelogInterval,
-      dayStartHour: plugin.settings.dayStartHour,
-      locale,
-      timeZone: getTimeZone(plugin),
-      utcCurrentDateHour: currentDate,
-      timeZoneAdjustedEntryDate: entry.timeZoneAdjustedDate
-    });
-  });
-
   function primaryClick(event: MouseEvent): void {
     event.stopPropagation();
 
     if (isVersionClickable()) {
       changelogFileClick({
         // Plugin.emptyTreeHash is guaranteed to be initialized. Git plugin throws an error when you pass Plugin.emptyTreeHash but I haven't been able to work around it and it doesn't affect usability.
-
-        aReference: previousEntry?.commitHash ?? plugin.emptyTreeHashUnsafe,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        aReference: previousEntry?.commitHash ?? plugin.emptyTreeHash!,
         bReference: entry.commitHash,
         event,
         file: entry,
@@ -71,10 +54,8 @@
 
   $effect(() => {
     if (openFileButton) {
-      setIcon(
-        openFileButton,
-        assertNotNull(openFileButton.getAttr('data-icon'))
-      );
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      setIcon(openFileButton, openFileButton.getAttr('data-icon')!);
     }
   });
   function isVersionClickable(): boolean {
@@ -86,6 +67,17 @@
       })
     );
   }
+
+  const formattedVersionDateLabel = $derived.by(() => {
+    // CurrentDay just used to trigger updates
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const currentDay = plugin.currentDay;
+    return composeVersionTitle({
+      interval: plugin.settings.fileChangelogInterval,
+      plugin,
+      timezoneAdjustedEntryDate: entry.timezoneAdjustedDate
+    });
+  });
 </script>
 
 <!-- svelte-ignore a11y_no_static_element_interactions -->
@@ -95,23 +87,6 @@
   aria-label={composeAriaLabel(entry)}
   data-tooltip-position="bottom"
   onclick={primaryClick}
-  onauxclick={(event) => {
-    event.stopPropagation();
-    // eslint-disable-next-line eqeqeq
-    if (event.button == 2) {
-      const view = plugin.app.workspace.getActiveViewOfType(FileChangelogView);
-      if (view) {
-        mayTriggerChangelogMenu({
-          event,
-          gitRelativePath: entry.pathGitRelative,
-          commitHash: entry.commitHash,
-          // Source: VAULT_CHANGELOG_VIEW_CONFIG.type,
-          view: view.leaf,
-          plugin
-        });
-      }
-    }
-  }}
 >
   <div class="git-changelog-file-name-container">
     <div

src/Views/VaultChangelog/VaultChangelog.svelte

@@ -2,14 +2,12 @@
   // Import { SimpleGit } from "src/gitManager/simpleGit";
   import type GitChangelogPlugin from 'main.ts';
   import type { EventRef } from 'obsidian';
-  import type { GitChangelogSettings } from 'settings/settings.ts';
 
   import { TOGGLE_FILES_SUMMARY_OPTION_ICON } from 'constants.ts';
   import { setIcon } from 'obsidian';
   import { onDestroy, untrack } from 'svelte';
   import { LoaderState } from 'svelte-infinite';
-  import { FileSummariesDisplayMode } from 'types.ts';
-  import { assertNotNull } from 'utils.ts';
+  import { FilesSummariesDisplayMode } from 'types.ts';
   import { getIntervalAdjectiveString } from 'Views/formatters.ts';
 
   import ChangeIntervalButton from '../components/ChangeIntervalButton.svelte';
@@ -142,39 +140,24 @@
     collapseButton = undefined;
   });
 
-  async function toggleFilesSummaryOption(): Promise<void> {
+  function toggleFilesSummaryOption(): void {
     showFilesCountSummariesMode =
-      showFilesCountSummariesMode === FileSummariesDisplayMode.Total
-        ? FileSummariesDisplayMode.TextAndBinary
-        : FileSummariesDisplayMode.Total;
+      showFilesCountSummariesMode === FilesSummariesDisplayMode.Total
+        ? FilesSummariesDisplayMode.TextAndBinary
+        : FilesSummariesDisplayMode.Total;
 
-    await plugin.settingsManager.editAndSave(
-      (settings: GitChangelogSettings): void => {
-        settings.fileSummariesDisplayMode = showFilesCountSummariesMode;
-      }
-    );
+    const newSettings = plugin.settingsClone;
+    newSettings.fileSummariesDisplayMode = showFilesCountSummariesMode;
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    plugin.saveSettings(newSettings);
   }
 
   function toggleCollapsedState(): void {
     // AllEntriesCollapsed needs to be cached because it is a reactive derived value that won't have a consistent state across the whole loop.
     const everythingCollapsed = allEntriesCollapsed;
-    if (changelogManager?.visibleEntries) {
-      // Temporary workaround to stop freezing when trying to expand a large number of versions.
-      if (
-        // eslint-disable-next-line no-magic-numbers
-        changelogManager?.visibleEntries?.length < 80 ||
-        everythingCollapsed !== true
-      ) {
-        for (const entry of changelogManager.visibleEntries)
-          entry.isCollapsed = !everythingCollapsed;
-      } else {
-        plugin.displayNotice(
-          `Too many versions. Unable to expand them all because of the impact on performance.`,
-          // eslint-disable-next-line no-magic-numbers
-          1500
-        );
-      }
-    }
+    if (changelogManager?.visibleEntries)
+      for (const entry of changelogManager.visibleEntries)
+        entry.isCollapsed = !everythingCollapsed;
   }
 </script>
 
@@ -208,7 +191,7 @@
         data-icon={TOGGLE_FILES_SUMMARY_OPTION_ICON}
         aria-disabled={changelogState !== VaultChangelogState.HasEntries}
         aria-label={showFilesCountSummariesMode ===
-        FileSummariesDisplayMode.Total
+        FilesSummariesDisplayMode.Total
           ? 'Text/media summary stats'
           : 'Total files summary stats'}
         bind:this={filesSummaryDisplayModeButton}
@@ -224,9 +207,11 @@
       {#if changelogState === VaultChangelogState.HasEntries}
         <InfiniteScroller
           {loaderState}
-          triggerLoad={assertNotNull(changelogManager).handleScroll}
+          triggerLoad={// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          changelogManager!.handleScroll}
         >
-          {#each assertNotNull(assertNotNull(changelogManager).visibleEntries) as version (version.commitHash)}
+          <!-- eslint-disable-next-line @typescript-eslint/no-non-null-assertion -->
+          {#each changelogManager!.visibleEntries! as version (version.commitHash)}
             <VersionComponent
               {version}
               {plugin}

src/Views/VaultChangelog/VaultChangelog.ts

@@ -57,7 +57,6 @@ export class VaultChangelogView extends ItemView {
   }
 
   public override onunload(): void {
-    super.onunload();
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.destroy();
   }

src/Views/VaultChangelog/components/File.svelte

@@ -4,9 +4,8 @@
 
   import { OPEN_FILE_ICON } from 'constants.ts';
   import { isFileRenamedOrMoved } from 'core/gitOperations/helper.ts';
-  import { mayTriggerChangelogMenu } from 'menu.ts';
   import { setIcon } from 'obsidian';
-  import { assertNotNull } from 'utils.ts';
+  import { mayTriggerFileMenu } from 'utils.ts';
   import {
     canOpenInDiffView,
     changelogFileClick,
@@ -40,7 +39,8 @@
   $effect(() => {
     for (const b of buttons) {
       if (b) {
-        setIcon(b, assertNotNull(b.getAttr('data-icon')));
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        setIcon(b, b.getAttr('data-icon')!);
       }
     }
   });
@@ -54,7 +54,8 @@
 
     if (!isClickable) return;
     changelogFileClick({
-      aReference: previousVersionCommitHash ?? plugin.emptyTreeHashUnsafe,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      aReference: previousVersionCommitHash ?? plugin.emptyTreeHash!,
       bReference: currentVersionCommitHash,
       event,
       file,
@@ -68,10 +69,7 @@
       .gitManager.getRelativeVaultPath(file.pathGitRelative);
   }
 
-  const fileOpenable = fileOpenableInObsidian({
-    relativeVaultPath: getRelativeVaultPath(),
-    plugin
-  });
+  const fileOpenable = fileOpenableInObsidian(getRelativeVaultPath(), plugin);
 
   function openVaultFile(event: MouseEvent): void {
     event.stopPropagation();
@@ -89,19 +87,19 @@
   data-tooltip-position="bottom"
   aria-label={ariaLabel}
   onclick={primaryClick}
-  onauxclick={(event) => {
+  onauxclick={// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+  (event) => {
     event.stopPropagation();
     // eslint-disable-next-line eqeqeq
     if (event.button == 2) {
       const view = plugin.app.workspace.getActiveViewOfType(VaultChangelogView);
       if (view) {
-        mayTriggerChangelogMenu({
+        mayTriggerFileMenu({
+          app: plugin.app,
           event,
-          gitRelativePath: file.pathGitRelative,
-          commitHash: currentVersionCommitHash,
-          // Source: VAULT_CHANGELOG_VIEW_CONFIG.type,
-          view: view.leaf,
-          plugin
+          filePath: getRelativeVaultPath(),
+          source: 'git-source-control',
+          view: view.leaf
         });
       }
     } else {

src/Views/VaultChangelog/components/FileSummariesStats.svelte

@@ -37,7 +37,7 @@
       type: DiffFileStatus.Modified
     },
     {
-      count: filesSummary.renamedAndMovedFiles,
+      count: filesSummary.renamedFiles,
       icon: FILE_RENAMED_ICON,
       type: DiffFileStatus.Renamed
     },

src/Views/VaultChangelog/components/Version.svelte

@@ -2,12 +2,9 @@
   import type { VaultChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
   import type GitChangelogPlugin from 'main.ts';
 
-  import { mayTriggerChangelogMenu } from 'menu.ts';
-  import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
   import { slide } from 'svelte/transition';
-  import { FileSummariesDisplayMode } from 'types.ts';
+  import { FilesSummariesDisplayMode } from 'types.ts';
   import { composeVersionTitle } from 'Views/formatters.ts';
-  import { VaultChangelogView } from 'Views/VaultChangelog/VaultChangelog.ts';
 
   import DiffStatsComponent from '../../components/DiffStats.svelte';
   import FileComponent from './File.svelte';
@@ -15,98 +12,65 @@
 
   interface Properties {
     plugin: GitChangelogPlugin;
-    showFilesCountSummaries: FileSummariesDisplayMode;
+    showFilesCountSummaries: FilesSummariesDisplayMode;
     version: VaultChangelogEntry;
-    hideTitleAndMakeUncollapsible?: boolean;
   }
 
-  const {
-    plugin,
-    showFilesCountSummaries,
-    version,
-    hideTitleAndMakeUncollapsible: hideTitleAndCollapseIcon
-  }: Properties = $props();
+  const { plugin, showFilesCountSummaries, version }: Properties = $props();
 
   const formattedVersionDateLabel = $derived.by(() => {
-    // Doing it this way to ensure they're properly reacted to if changed.
-    const currentDate = plugin.utcCurrentDateHour;
-    const locale = plugin.localeSafe;
+    // CurrentDay just used to trigger updates
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const currentDay = plugin.currentDay;
     return composeVersionTitle({
-      interval: plugin.settings.vaultChangelogInterval,
-      dayStartHour: plugin.settings.dayStartHour,
-      locale,
-      timeZone: getTimeZone(plugin),
-      utcCurrentDateHour: currentDate,
-      timeZoneAdjustedEntryDate: version.timeZoneAdjustedDate
+      interval: plugin.settings.vaultChangelogGenerationSettings.interval,
+      plugin,
+      timezoneAdjustedEntryDate: version.timezoneAdjustedDate
     });
   });
 </script>
 
 <!-- svelte-ignore a11y_no_static_element_interactions -->
 <!-- svelte-ignore a11y_click_events_have_key_events -->
-<div
-  class:is-collapsed={hideTitleAndCollapseIcon ? false : version.isCollapsed}
-  class="git-changelog-bottom-padding"
->
+<div class:is-collapsed={version.isCollapsed}>
   <div
-    class={`tree-item-self${hideTitleAndCollapseIcon ? '' : ' is-clickable'}`}
+    class="tree-item-self is-clickable git-changelog-bottom-padding"
     data-tooltip-position="bottom"
-    onclick={hideTitleAndCollapseIcon
-      ? undefined
-      : () => {
-          version.isCollapsed = !version.isCollapsed;
-        }}
-    onauxclick={(event) => {
-      event.stopPropagation();
-      // eslint-disable-next-line eqeqeq
-      if (event.button == 2) {
-        const view =
-          plugin.app.workspace.getActiveViewOfType(VaultChangelogView);
-        if (view) {
-          mayTriggerChangelogMenu({
-            event,
-            commitHash: version.commitHash,
-            view: view.leaf,
-            plugin
-          });
-        }
-      }
+    onclick={/* eslint-disable-next-line @typescript-eslint/explicit-function-return-type */
+    () => {
+      version.isCollapsed = !version.isCollapsed;
     }}
   >
-    {#if !hideTitleAndCollapseIcon}
-      <div
-        class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
-        class:is-collapsed={version.isCollapsed}
+    <div
+      class="tree-item-icon nav-folder-collapse-indicator collapse-icon"
+      class:is-collapsed={version.isCollapsed}
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="24"
+        height="24"
+        viewBox="0 0 24 24"
+        fill="none"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        class="svg-icon right-triangle"><path d="M3 8L12 17L21 8" /></svg
       >
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="24"
-          height="24"
-          viewBox="0 0 24 24"
-          fill="none"
-          stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          class="svg-icon right-triangle"><path d="M3 8L12 17L21 8" /></svg
-        >
-      </div>
-    {/if}
+    </div>
     <div class="file-stats git-changelog-files-summaries-stats">
-      {#if !hideTitleAndCollapseIcon}
-        <div class="git-changelog-entry-title">
-          <div>{formattedVersionDateLabel}</div>
-          {#if !version.previousVersionCommitHash}
-            <div>
-              <span class="nav-file-tag git-changelog-initial-version-tag"
-                >Initial</span
-              >
-            </div>
-          {/if}
-        </div>
-      {/if}
+      <div class="git-changelog-entry-title">
+        <div>{formattedVersionDateLabel}</div>
+        {#if !version.previousVersionCommitHash}
+          <div>
+            <span class="nav-file-tag git-changelog-initial-version-tag"
+              >Initial</span
+            >
+          </div>
+        {/if}
+      </div>
       <!-- if more than one option is selected then show labels -->
-      {#if showFilesCountSummaries === FileSummariesDisplayMode.Total}
+      {#if showFilesCountSummaries === FilesSummariesDisplayMode.Total}
         <div class="git-changelog-stat">
           <DayFilesStatusComponent
             filesSummary={version.getChangelogFilesSummary()}
@@ -114,7 +78,7 @@
         </div>
       {/if}
 
-      {#if showFilesCountSummaries === FileSummariesDisplayMode.TextAndBinary}
+      {#if showFilesCountSummaries === FilesSummariesDisplayMode.TextAndBinary}
         {#if version.binaryFiles.length > 0}
           <div class="git-changelog-stat">
             <DayFilesStatusComponent
@@ -148,7 +112,7 @@
       />
     </div>
   </div>
-  {#if hideTitleAndCollapseIcon ? true : !version.isCollapsed}
+  {#if !version.isCollapsed}
     <div class="tree-item-children" transition:slide|local={{ duration: 150 }}>
       {#each version.textFiles as file (file.pathGitRelative)}
         {#if file !== undefined && file !== undefined}

src/Views/formatters.ts

@@ -1,30 +1,29 @@
+import type GitChangelogPlugin from 'main.ts';
 import type { Spacetime } from 'spacetime';
 import type { DiffFile } from 'types.ts';
 
 import { normalizePath } from 'obsidian';
+import { getUserLocale } from 'settings/ui/CustomLocale.ts';
+import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
+import { getDayStartTime } from 'settings/ui/DayStartTime.ts';
 import spacetime from 'spacetime';
-import { applyDayStartHourSetting } from 'timeUtils.ts';
+import { applyDayStartTimeSetting } from 'timeUtils.ts';
 import { ChangelogInterval } from 'types.ts';
-import {
-  assertNotNull,
-  getFileNameFromPath,
-  isMoved,
-  isRenamed
-} from 'utils.ts';
+import { getFileNameFromPath, isMoved, isRenamed } from 'utils.ts';
 
 export function composeAriaLabel(file: DiffFile): string {
   try {
     let ariaString = '';
     if (isMoved(file)) {
-      ariaString += assertNotNull(file.fromPathGitRelative);
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      ariaString += file.fromPathGitRelative!;
       ariaString += ' →';
       ariaString += '\n';
       ariaString += file.pathGitRelative;
     } else if (isRenamed(file)) {
       ariaString += getFileNameFromPath({
-        normalizedFilePath: normalizePath(
-          assertNotNull(file.fromPathGitRelative)
-        )
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        normalizedFilePath: normalizePath(file.fromPathGitRelative!)
       });
       ariaString += ' → ';
       ariaString += getFileNameFromPath({
@@ -56,27 +55,14 @@ export function getIntervalAdjectiveString(
 }
 
 export function composeDailyVersionDisplayText({
-  timeZoneAdjustedCurrentDate,
-  locale,
-  timeZone,
-  timeZoneAdjustedEntryDate,
-  dayStartHour
+  fullyAdjustedCurrentDate,
+  fullyAdjustedEntryDate,
+  plugin
 }: {
-  timeZoneAdjustedCurrentDate: Spacetime;
-  timeZoneAdjustedEntryDate: Spacetime;
-  locale: string;
-  dayStartHour: number;
-  timeZone: string;
+  fullyAdjustedCurrentDate: Spacetime;
+  fullyAdjustedEntryDate: Spacetime;
+  plugin: GitChangelogPlugin;
 }): string {
-  const fullyAdjustedEntryDate = applyDayStartHourSetting({
-    dayStartHour,
-    timeZoneAdjustedDate: timeZoneAdjustedEntryDate
-  });
-  const fullyAdjustedCurrentDate = applyDayStartHourSetting({
-    dayStartHour,
-    timeZoneAdjustedDate: timeZoneAdjustedCurrentDate
-  });
-
   const isToday = fullyAdjustedEntryDate.isSame(
     fullyAdjustedCurrentDate,
     'day'
@@ -93,152 +79,154 @@ export function composeDailyVersionDisplayText({
     return 'Yesterday';
   }
 
-  return formatDate(fullyAdjustedEntryDate.toNativeDate(), locale, timeZone);
+  return formatDate(
+    fullyAdjustedEntryDate.toNativeDate(),
+    getUserLocale(plugin)
+  );
 }
 
 // Only for composing the UI string
 export function applyDayDisplayOffset({
-  dayStartHour,
-  timeZoneAdjustedDate
+  dayStartTime,
+  timezoneAdjustedDate
 }: {
-  dayStartHour: number;
-  timeZoneAdjustedDate: Spacetime;
+  dayStartTime: number;
+  timezoneAdjustedDate: Spacetime;
 }): Spacetime {
-  const dayOffset = timeZoneAdjustedDate.hour() < dayStartHour ? 1 : 0;
-  return timeZoneAdjustedDate.clone().subtract(dayOffset, 'day');
+  const dayOffset = timezoneAdjustedDate.hour() < dayStartTime ? 1 : 0;
+  return timezoneAdjustedDate.clone().subtract(dayOffset, 'day');
 }
 
 export function composeHourlyVersionDisplayText({
-  timeZoneAdjustedEntryDate,
-  locale,
-  timeZone,
-  timeZoneAdjustedCurrentDate
+  fullyAdjustedCurrentDate,
+  fullyAdjustedEntryDate,
+  timezoneAdjustedEntryDate,
+  plugin
 }: {
-  timeZoneAdjustedEntryDate: Spacetime;
-  locale: string;
-  timeZoneAdjustedCurrentDate: Spacetime;
-  timeZone: string;
+  fullyAdjustedCurrentDate: Spacetime;
+  fullyAdjustedEntryDate: Spacetime;
+  timezoneAdjustedEntryDate: Spacetime;
+  plugin: GitChangelogPlugin;
 }): string {
-  const isToday = timeZoneAdjustedEntryDate.isSame(
-    timeZoneAdjustedCurrentDate,
+  // Use the fullyAdjusted dates only to check if the dates belong to the same day after the dayStartTime setting is applied.
+  const isToday = fullyAdjustedEntryDate.isSame(
+    fullyAdjustedCurrentDate,
     'day'
   );
-  const isYesterday = timeZoneAdjustedEntryDate.isSame(
-    timeZoneAdjustedCurrentDate.clone().subtract(1, 'days'),
+  const isYesterday = fullyAdjustedEntryDate.isSame(
+    fullyAdjustedCurrentDate.clone().subtract(1, 'days'),
     'day'
   );
 
+  const userLocale = getUserLocale(plugin);
+
   // Replaces the day part of the date time string with today or yesterday labels.
   if (isToday || isYesterday) {
-    const timeFormatter = new Intl.DateTimeFormat(locale, {
-      timeStyle: 'short',
-      timeZone
+    const timeFormatter = new Intl.DateTimeFormat(userLocale, {
+      timeStyle: 'short'
     });
     const timeString = timeFormatter.format(
-      timeZoneAdjustedEntryDate.startOf('hour').toNativeDate()
+      timezoneAdjustedEntryDate.startOf('hour').toNativeDate()
     );
     return `${isToday ? 'Today' : 'Yesterday'}, ${timeString}`;
   }
 
-  const formatter = new Intl.DateTimeFormat(locale, {
+  const formatter = new Intl.DateTimeFormat(userLocale, {
     dateStyle: 'short',
-    timeStyle: 'short',
-    timeZone
+    timeStyle: 'short'
+  });
+
+  // Use the timezoneAdjustedEntryDate in the UI and just potentially subtract a day if it crosses the dayStartTime boundary. Don't show the fake fullyAdjustedEntryDate that has the dayStartTime offset applied to hours.
+  const timezoneAdjustedEntryDateWithDayOffset = applyDayDisplayOffset({
+    dayStartTime: getDayStartTime(plugin.settings.changelogGenerationSettings),
+    timezoneAdjustedDate: timezoneAdjustedEntryDate
   });
 
   return formatter.format(
-    timeZoneAdjustedEntryDate.startOf('hour').toNativeDate()
+    timezoneAdjustedEntryDateWithDayOffset.startOf('hour').toNativeDate()
   );
 }
 
 export function composeMonthlyVersionDisplayText({
-  timeZoneAdjustedEntryDate,
-  locale,
-  timeZone
+  fullyAdjustedEntryDate,
+  plugin
 }: {
-  timeZoneAdjustedEntryDate: Spacetime;
-  locale: string;
-  timeZone: string;
+  fullyAdjustedEntryDate: Spacetime;
+  plugin: GitChangelogPlugin;
 }): string {
   return formatMonthYear(
-    timeZoneAdjustedEntryDate.toNativeDate(),
-    locale,
-    timeZone
+    fullyAdjustedEntryDate.toNativeDate(),
+    getUserLocale(plugin)
   );
 }
 
 export function composeVersionTitle({
   interval,
-  dayStartHour,
-  locale,
-  timeZone,
-  timeZoneAdjustedEntryDate,
-  utcCurrentDateHour
+  plugin,
+  timezoneAdjustedEntryDate
 }: {
   interval: ChangelogInterval;
-  dayStartHour: number;
-  locale: string;
-  utcCurrentDateHour: string;
-  timeZone: string;
-  timeZoneAdjustedEntryDate: Spacetime;
+  plugin: GitChangelogPlugin;
+  timezoneAdjustedEntryDate: Spacetime;
 }): string {
-  // Clipped to the hour
-  const timeZoneAdjustedCurrentDate =
-    spacetime(utcCurrentDateHour).goto(timeZone);
+  const timezoneAdjustedCurrentDate = spacetime.now(
+    getTimeZone(plugin.settings.changelogGenerationSettings, plugin)
+  );
+  const fullyAdjustedCurrentDate = applyDayStartTimeSetting({
+    dayStartTime: getDayStartTime(plugin.settings.changelogGenerationSettings),
+    timezoneAdjustedDate: timezoneAdjustedCurrentDate
+  });
+  const fullyAdjustedEntryDate = applyDayStartTimeSetting({
+    dayStartTime: getDayStartTime(plugin.settings.changelogGenerationSettings),
+    timezoneAdjustedDate: timezoneAdjustedEntryDate
+  });
 
   switch (interval) {
     case ChangelogInterval.Hourly: {
       return composeHourlyVersionDisplayText({
-        timeZoneAdjustedEntryDate,
-        timeZoneAdjustedCurrentDate,
-        locale,
-        timeZone
+        fullyAdjustedCurrentDate,
+        fullyAdjustedEntryDate,
+        timezoneAdjustedEntryDate,
+        plugin
       });
     }
     case ChangelogInterval.Daily: {
       return composeDailyVersionDisplayText({
-        timeZoneAdjustedEntryDate,
-        timeZoneAdjustedCurrentDate,
-        dayStartHour,
-        locale,
-        timeZone
+        fullyAdjustedCurrentDate,
+        fullyAdjustedEntryDate,
+        plugin
       });
     }
     case ChangelogInterval.Weekly: {
       return composeWeeklyVersionDisplayText({
-        timeZoneAdjustedEntryDate,
-        timeZoneAdjustedCurrentDate,
-        locale,
-        timeZone
+        fullyAdjustedCurrentDate,
+        fullyAdjustedEntryDate,
+        plugin
       });
     }
     case ChangelogInterval.Monthly: {
       return composeMonthlyVersionDisplayText({
-        timeZoneAdjustedEntryDate,
-        locale,
-        timeZone
+        fullyAdjustedEntryDate,
+        plugin
       });
     }
   }
 }
 
 export function composeWeeklyVersionDisplayText({
-  timeZoneAdjustedEntryDate,
-  timeZoneAdjustedCurrentDate,
-  locale,
-  timeZone
+  fullyAdjustedCurrentDate,
+  fullyAdjustedEntryDate,
+  plugin
 }: {
-  timeZoneAdjustedCurrentDate: Spacetime;
-  timeZoneAdjustedEntryDate: Spacetime;
-  locale: string;
-  timeZone: string;
+  fullyAdjustedCurrentDate: Spacetime;
+  fullyAdjustedEntryDate: Spacetime;
+  plugin: GitChangelogPlugin;
 }): string {
-  const timeZoneAdjustedEntryWeek = timeZoneAdjustedEntryDate.startOf('week');
+  const fullyAdjustedEntryWeek = fullyAdjustedEntryDate.startOf('week');
 
-  // In order for this to be accurate we need to normalize the dates to the start of the interval, which is a week here.
-  // If comparing would be based on what the actual commit date is of the current version is, instead of that interval that version belongs to, the diffs would be inconsistent because e.g. when comparing the latest version with the latest commit on thursday with the previous version that had it's last commit on wednesday, the diff would count 2 weeks difference instead of 1.
-  const weeksDifference = timeZoneAdjustedEntryWeek.diff(
-    timeZoneAdjustedCurrentDate.startOf('week'),
+  // In order for this to be accurate we need to normalize the dates to the start of the interval, which is a week here. If comparing would be based on what the actual commit date is of the current version is, instead of that interval that version belongs to, the diffs would be inconsistent because e.g. when comparing the latest version with the latest commit on thursday with the previous version that had it's last commit on wednesday, the diff would count 2 weeks difference instead of 1.
+  const weeksDifference = fullyAdjustedEntryWeek.diff(
+    fullyAdjustedCurrentDate.startOf('week'),
     'weeks'
   );
 
@@ -249,41 +237,34 @@ export function composeWeeklyVersionDisplayText({
     return 'Last week';
   }
 
-  const weekNumber = timeZoneAdjustedEntryDate.week();
+  const userLocale = getUserLocale(plugin);
 
-  const isCurrentYear = timeZoneAdjustedEntryDate.isSame(
-    timeZoneAdjustedCurrentDate,
+  const weekNumber = fullyAdjustedEntryDate.week();
+
+  const isCurrentYear = fullyAdjustedEntryDate.isSame(
+    fullyAdjustedCurrentDate,
     'year'
   );
 
-  const nativeTimeZoneAdjustedEntryWeek =
-    timeZoneAdjustedEntryWeek.toNativeDate();
+  const nativeFullyAdjustedEntryWeek = fullyAdjustedEntryWeek.toNativeDate();
 
   if (isCurrentYear) {
-    const monthString = new Intl.DateTimeFormat(locale, {
-      month: 'short',
-      timeZone
-    }).format(nativeTimeZoneAdjustedEntryWeek);
+    const monthString = new Intl.DateTimeFormat(userLocale, {
+      month: 'short'
+    }).format(nativeFullyAdjustedEntryWeek);
     return `Week ${weekNumber}, ${monthString}`;
   }
 
-  const monthAndYearString = new Intl.DateTimeFormat(locale, {
+  const monthAndYearString = new Intl.DateTimeFormat(userLocale, {
     month: 'short',
-    year: '2-digit',
-    timeZone
-  }).format(nativeTimeZoneAdjustedEntryWeek);
+    year: '2-digit'
+  }).format(nativeFullyAdjustedEntryWeek);
 
   return `Week ${weekNumber}, ${monthAndYearString}`;
 }
 
-export function formatDate(
-  date: Date,
-  locale: string,
-  timeZone: string
-): string {
-  const formatter = new Intl.DateTimeFormat(locale, {
-    timeZone
-  });
+export function formatDate(date: Date, locale: string): string {
+  const formatter = new Intl.DateTimeFormat(locale);
   return formatter.format(date);
 }
 
@@ -297,31 +278,10 @@ export function formatDiffFileType(file: DiffFile): string {
   return fileExtension.toLocaleUpperCase();
 }
 
-export function formatMonthYear(
-  date: Date,
-  locale: string,
-  timeZone: string
-): string {
+export function formatMonthYear(date: Date, locale: string): string {
   return new Intl.DateTimeFormat(locale, {
     month: 'long',
-    year: 'numeric',
-    timeZone
-  }).format(date);
-}
-
-export function formatFullDate(
-  date: Date,
-  locale: string,
-  timeZone: string
-): string {
-  return new Intl.DateTimeFormat(locale, {
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-    second: 'numeric',
-    year: 'numeric',
-    timeZone
+    year: 'numeric'
   }).format(date);
 }
 

src/Views/helper.ts

@@ -1,11 +1,12 @@
-import type { App, ItemView } from 'obsidian';
+import type { ItemView } from 'obsidian';
 
 import { MarkdownView, TFile } from 'obsidian';
-import { getNewLeaf } from 'utils.ts';
 
 import type GitChangelogPlugin from '../main.ts';
 import type { DiffFile } from '../types.ts';
 
+import { getNewLeaf } from '../utils.ts';
+
 export function changelogFileClick({
   aReference,
   bReference,
@@ -26,16 +27,10 @@ export function changelogFileClick({
   }
 }
 
-export function fileOpenableInObsidian({
-  relativeVaultPath,
-  plugin
-}: {
-  relativeVaultPath?: string;
-  plugin: GitChangelogPlugin;
-}): boolean {
-  if (!relativeVaultPath) {
-    return false;
-  }
+export function fileOpenableInObsidian(
+  relativeVaultPath: string,
+  plugin: GitChangelogPlugin
+): boolean {
   // This isn't perfect because some old file path could match an unrelated file's current path in the current state of the vault.
   const existingFile =
     plugin.app.vault.getAbstractFileByPath(relativeVaultPath);
@@ -87,18 +82,11 @@ export function getDisplayPath(path: string): string {
   return path.split('/').last()?.replace(/\.md$/, '') ?? '';
 }
 
-/**
- * Assumes that no file view is currently active
- */
-export function isDiffViewVisible({ app }: { app: App }): boolean {
-  const diffViews = [
-    ...app.workspace.getLeavesOfType('diff-view'),
-    ...app.workspace.getLeavesOfType('split-diff-view')
-  ];
-
-  return diffViews.some((leaf) => {
-    return leaf.containerEl.isShown();
-  });
+export function isDiffView(view: ItemView | null): boolean {
+  return (
+    view?.getViewType() === 'diff-view' ||
+    view?.getViewType() === 'split-diff-view'
+  );
 }
 
 export function openFile({
@@ -143,18 +131,3 @@ export function showDiff(
     event
   });
 }
-
-export function registerCloseViewIfDeferred(
-  compareView: ItemView,
-  plugin: GitChangelogPlugin
-): void {
-  // On each workspace layout change, check if this view is still visible.
-  compareView.registerEvent(
-    plugin.app.workspace.on('active-leaf-change', () => {
-      // If the view exists but isn't visible, close it
-      if (!compareView.contentEl.isShown()) {
-        compareView.leaf.detach();
-      }
-    })
-  );
-}

src/commands.ts

@@ -1,16 +1,5 @@
 import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
-import type { GitChangelogSettings } from 'settings/settings.ts';
-import type { CompareRepoCommitsViewState } from 'types.ts';
 
-import {
-  COMPARE_REPO_COMMITS_VIEW_CONFIG,
-  COMPARE_TO_CHECKPOINT_VIEW_CONFIG
-} from 'constants.ts';
-import { CssClass } from 'obsidian-dev-utils/CssClass';
-import { showModal } from 'obsidian-dev-utils/obsidian/Modals/ModalBase';
-import { openCompareToCheckpointView } from 'settings/ui/ReviewChangesReminderInterval.ts';
-import { removeCompareVersionsView } from 'utils.ts';
-import { CompareVersionsModal } from 'Views/CompareRepoCommits/CompareModal.ts';
 import { FILE_CHANGELOG_VIEW_CONFIG } from 'Views/FileChangelog/FileChangelog.ts';
 import { VAULT_CHANGELOG_VIEW_CONFIG } from 'Views/VaultChangelog/VaultChangelog.ts';
 
@@ -40,77 +29,4 @@ export function addCommands(plugin: GitChangelogPlugin): void {
     id: `open-${FILE_CHANGELOG_VIEW_CONFIG.type}`,
     name: `Open ${FILE_CHANGELOG_VIEW_CONFIG.name.toLocaleLowerCase()} view`
   });
-
-  plugin.addCommand({
-    callback: async () => {
-      await openCompareToCheckpointView(plugin);
-    },
-    id: `show-${COMPARE_TO_CHECKPOINT_VIEW_CONFIG.type}`,
-    name: `Show ${COMPARE_TO_CHECKPOINT_VIEW_CONFIG.name.toLocaleLowerCase()}`
-  });
-
-  plugin.addCommand({
-    callback: async () => {
-      await plugin.settingsManager.editAndSave(
-        (settings: GitChangelogSettings): void => {
-          settings.enableExclusionList = !settings.enableExclusionList;
-        }
-      );
-
-      // Hotkeys or the command palette don't work in the settings tab under normal circumstances so we don't have to handle refreshing the settingsTab display
-      plugin.displayNotice(
-        plugin.settings.enableExclusionList
-          ? 'Exclusion list enabled.'
-          : 'Exclusion list disabled.',
-        // eslint-disable-next-line no-magic-numbers
-        1500
-      );
-    },
-    id: `toggle-exclusion-list`,
-    name: `Toggle exclusion list`
-  });
-
-  addCompareRepoVersionsCommand(plugin);
-}
-
-function addCompareRepoVersionsCommand(plugin: GitChangelogPlugin): void {
-  plugin.addCommand({
-    id: 'compare-two-versions',
-    name: 'Compare two vault states in history',
-    callback: async () => {
-      // Always returns undefined if the modal was exited without clicking "approve" button.
-      const compareRepoCommitsViewState = await showModal<
-        CompareRepoCommitsViewState | undefined
-      >(
-        (resolve) =>
-          new CompareVersionsModal({
-            plugin,
-            resolve,
-            modalCssClass: CssClass.ConfirmModal,
-            options: {
-              app: plugin.app,
-              cssClass: CssClass.ConfirmModal
-            },
-            utcOlderDateString: plugin.compareVersionsUtcOlderDate,
-            utcNewerDateString: plugin.compareVersionsUtcNewerDate
-          })
-      );
-
-      if (compareRepoCommitsViewState) {
-        // Close any existing COMPARE_REPO_STATES_VIEW views
-        removeCompareVersionsView(plugin);
-
-        plugin.compareVersionsUtcNewerDate =
-          compareRepoCommitsViewState.utcNewerDate;
-        plugin.compareVersionsUtcOlderDate =
-          compareRepoCommitsViewState.utcOlderDate;
-
-        await plugin.app.workspace.ensureSideLeaf(
-          COMPARE_REPO_COMMITS_VIEW_CONFIG.type,
-          'left',
-          { reveal: true }
-        );
-      }
-    }
-  });
 }

src/constants.ts

@@ -1,27 +1,6 @@
-import type GitChangelogPlugin from 'main.ts';
-import type { PluginTypesBase } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { GitChangelogSettings } from 'settings/settings.ts';
-import type { GitChangelogSettingsManager } from 'settings/settingsManager.ts';
-import type { GitChangelogSettingsTab } from 'settings/settingsTab.ts';
-
 export const PLUGIN_NAME = 'Git Changelog';
-export const PLUGIN_NAME_SENTENCE_CASE = 'Git changelog';
 export const MIN_COMPATIBLE_GIT_PLUGIN_VERSION = '2.31.1';
-export const MAX_TESTED_GIT_PLUGIN_VERSION = '2.34.0';
-
-export interface GitChangelogPluginTypes extends PluginTypesBase {
-  plugin: GitChangelogPlugin;
-  pluginSettings: GitChangelogSettings;
-  pluginSettingsManager: GitChangelogSettingsManager;
-  pluginSettingsTab: GitChangelogSettingsTab;
-}
-
-// Strings
-export const FEEDBACK_URL =
-  'https://github.com/shumadrid/obsidian-git-changelog/issues';
-export const EXCLUDE_FILES_AND_FOLDERS = 'Exclude files and folders';
-export const CHANGES_SINCE_LAST_CHECKPOINT =
-  'changes since the last checkpoint';
+export const MAX_TESTED_GIT_PLUGIN_VERSION = '2.32.1';
 
 // Icons
 export const ADDITIONS_ICON = 'list-plus';
@@ -38,26 +17,8 @@ export const TOGGLE_FILES_SUMMARY_OPTION_ICON = 'list-tree';
 export const OPEN_FILE_ICON = 'file-input';
 export const PLUS_ICON = 'plus';
 export const MINUS_ICON = 'minus';
-export const COPY_COMMIT_HASH_ICON = 'git-commit-horizontal';
-export const COMPARED_VERSIONS_DATE_SEPARATOR_ICON = 'clock-10';
-export const INFO_TOOLTIP_ICON = 'info';
 
 export const CHANGELOG_LOAD_AMOUNT_BASE_MULTIPLIER = 35;
 export const CHANGELOG_LOAD_AMOUNT_VERSIONS = 10;
 export const FILE_VIEW_VERSIONS_MULTIPLIER = 2.4;
 export const VAULT_MAX_COUNT_MULTIPLIER = 6;
-
-// Settings
-export const MIN_RENAME_DETECTION_STRICTNESS = 1;
-export const MAX_RENAME_DETECTION_STRICTNESS = 100;
-
-export const COMPARE_TO_CHECKPOINT_VIEW_CONFIG = {
-  icon: 'spline',
-  name: 'Vault changes since the last checkpoint',
-  type: 'compare-to-checkpoint-view'
-};
-export const COMPARE_REPO_COMMITS_VIEW_CONFIG = {
-  icon: 'spline',
-  name: "Vault's git history comparison",
-  type: 'vault-git-history-comparison-view'
-};

src/core/ChangelogEntry.svelte.ts

@@ -8,7 +8,7 @@ import type {
 
 export abstract class ChangelogEntry {
   public constructor(
-    public timeZoneAdjustedDate: Spacetime,
+    public timezoneAdjustedDate: Spacetime,
 
     public commitHash: string // Represents a single commit that's just the latest commit of a certain interval (day,week...).
   ) {}
@@ -33,16 +33,16 @@ export class FileChangelogEntry extends ChangelogEntry implements DiffFile {
     pathGitRelative,
     status,
     textDiffStats,
-    timeZoneAdjustedDate
+    timezoneAdjustedDate
   }: {
     commitHash: string;
     fromPathGitRelative?: string;
     pathGitRelative: string;
     status: DiffFileStatus;
     textDiffStats?: TextDiffStats;
-    timeZoneAdjustedDate: Spacetime;
+    timezoneAdjustedDate: Spacetime;
   }) {
-    super(timeZoneAdjustedDate, commitHash);
+    super(timezoneAdjustedDate, commitHash);
     this.pathGitRelative = pathGitRelative;
     this.status = status;
     this.fromPathGitRelative = fromPathGitRelative;
@@ -75,25 +75,25 @@ export class VaultChangelogEntry extends ChangelogEntry {
     binaryFiles,
     binaryFilesSummaryCached,
     commitHash,
-    previousVersionLastCommitHash,
+    previousDayLastCommitHash,
     textFiles,
     textFilesSummaryCached,
-    timeZoneAdjustedDate
+    timezoneAdjustedDate
   }: {
     binaryFiles: DiffFile[];
     binaryFilesSummaryCached: FilesSummary;
     commitHash: string;
-    previousVersionLastCommitHash?: string;
+    previousDayLastCommitHash?: string;
     textFiles: DiffFile[];
     textFilesSummaryCached: FilesSummary;
-    timeZoneAdjustedDate: Spacetime;
+    timezoneAdjustedDate: Spacetime;
   }) {
-    super(timeZoneAdjustedDate, commitHash);
+    super(timezoneAdjustedDate, commitHash);
     this.textFiles = textFiles;
     this.binaryFiles = binaryFiles;
     this.textFilesSummaryCached = textFilesSummaryCached;
     this.binaryFilesSummaryCached = binaryFilesSummaryCached;
-    this.previousVersionCommitHash = previousVersionLastCommitHash;
+    this.previousVersionCommitHash = previousDayLastCommitHash;
   }
 
   public override getPotentialGitFilePath(): undefined {
@@ -143,9 +143,9 @@ export class VaultChangelogEntry extends ChangelogEntry {
       modifiedFiles:
         this.textFilesSummaryCached.modifiedFiles +
         this.binaryFilesSummaryCached.modifiedFiles,
-      renamedAndMovedFiles:
-        this.textFilesSummaryCached.renamedAndMovedFiles +
-        this.binaryFilesSummaryCached.renamedAndMovedFiles
+      renamedFiles:
+        this.textFilesSummaryCached.renamedFiles +
+        this.binaryFilesSummaryCached.renamedFiles
     };
   }
 

src/core/ChangelogManager.svelte.ts

@@ -1,8 +1,6 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
 import type { ChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
 import type GitChangelogPlugin from 'main.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { GitChangelogSettings } from 'settings/settings.ts';
+import type { GitChangelogPluginSettings } from 'settings/settings.ts';
 import type { Spacetime } from 'spacetime';
 import type { TaskManager } from 'TaskManager.svelte.ts';
 import type { ReadonlyDeep } from 'type-fest';
@@ -14,9 +12,7 @@ import {
   extractLastCommitsForInterval,
   GIT_MAX_CONCURRENT_PROCESSES
 } from 'core/helper.ts';
-import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
 import { AbortError, ChangelogInterval } from 'types.ts';
-import { assertNotNull } from 'utils.ts';
 
 export abstract class ChangelogManager<T extends ChangelogEntry> {
   public visibleEntries = $state<T[] | undefined>();
@@ -24,7 +20,7 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
 
   public hasEntries = $derived((this.visibleEntries?.length ?? 0) > 0);
 
-  protected reservedEntries: T[] = [];
+  protected reservedEntries = $state<T[]>([]);
 
   protected plugin: GitChangelogPlugin;
 
@@ -100,8 +96,6 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     // We want to immediately cancel all current operations for the changelog and schedule the operation in a queue.
     const abortSignal = this.resetAndGetSignal();
 
-    // Abort controllers don't just serve to optimize performance by stopping the execution of cancelled functions, but they also serve to prevent those cancelled functions from mutating current state and introducing race conditions.
-    // All abort signals need to be created on call time, and also the plugin settings (it's not strictly necessary, because operations with outdated settings will always get cancelled anyway).
     this.taskManager.enqueueSafely(async () => {
       await this.computeChangelog(abortSignal);
     });
@@ -124,14 +118,12 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     });
   }
 
-  public abstract specificSettingsChanged(
-    oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >
-  ): boolean;
+  public generationSettingsChanged(
+    oldSettings: ReadonlyDeep<GitChangelogPluginSettings>,
+    newSettings: GitChangelogPluginSettings
+  ): boolean {
+    return this.getInterval(oldSettings) !== this.getInterval(newSettings);
+  }
 
   public resetAndGetSignal(): AbortSignal {
     // Reset `visibleEntries` to undefined each time when you schedule a recompute so that the UI correctly updates to "loading" state while it waits for the stats to compute.
@@ -148,7 +140,7 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
   public abstract setNextInterval(): Promise<void>;
 
   public abstract getInterval(
-    settings?: ReadonlyDeep<GitChangelogSettings>
+    settings?: ReadonlyDeep<GitChangelogPluginSettings>
   ): ChangelogInterval;
 
   protected abstract updateEntries({
@@ -169,27 +161,21 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     abortSignal: AbortSignal;
     activeGitFile?: string;
   }): Promise<T[]> {
-    // Terminology:
-    // ActiveGitFile: the current file path of some live file version.
-    // FilePath: the path of some file in history.
-
-    const git = await this.plugin.getGit();
     // Gets all commits newer (>=) than the commit of the latest cached version.
-    const timeZoneAdjustedLogs = await runLog({
+    const timezoneAdjustedLogs = await runLog({
       abortSignal,
       filePath: activeGitFile,
       lowerBoundaryCommit: this.latestCachedVersion?.commitHash,
       maxCount: undefined,
-      upperBoundaryCommit: undefined,
-      git,
-      renameDetectionStrictness: this.plugin.settings.renameDetectionStrictness,
-      timeZone: getTimeZone(this.plugin)
+      plugin: this.plugin,
+      upperBoundaryCommit: undefined
     });
 
     const extractedVersions = await extractLastCommitsForInterval({
-      dayStartHour: this.plugin.settings.dayStartHour,
+      changelogGenerationSettings:
+        this.plugin.settings.changelogGenerationSettings,
       interval: this.getInterval(),
-      timeZoneAdjustedLogs
+      timezoneAdjustedLogs
     });
 
     // Always recalculate the latest version in cached changelog (because it likely has outdated stats), but only if there are any versions to recalculate.
@@ -201,7 +187,7 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
       extractedVersions.push({
         filePath: versionBeforeLatestCached.getPotentialGitFilePath(),
         hash: versionBeforeLatestCached.commitHash,
-        timeZoneAdjustedDate: versionBeforeLatestCached.timeZoneAdjustedDate
+        timezoneAdjustedDate: versionBeforeLatestCached.timezoneAdjustedDate
       });
     }
 
@@ -216,7 +202,8 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
 
     // If initial version was reached, diff it against an empty state.
     if (extractedVersions.length > 0 && this.cacheHasNoCompleteVersion()) {
-      const lastCommit = assertNotNull(extractedVersions.at(-1));
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const lastCommit = extractedVersions.at(-1)!;
       await this.appendToEntries({
         abortSignal,
         currentCommit: lastCommit,
@@ -258,10 +245,6 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     abortSignal: AbortSignal;
     filePath: string | undefined;
   }): Promise<void> {
-    if (abortSignal.aborted) {
-      throw new AbortError();
-    }
-
     // If we are re-computing or initially loading we can't rely on the reserved entries because there aren't any (that are valid).
     if (this.visibleEntries === undefined) {
       await this.retrieveMoreEntries({
@@ -271,7 +254,6 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
       });
     } else {
       // If necessary, retrieve additional entries (if there are any left) and then append.
-      // Check for sufficient versions when the task gets it's turn, not when it is added to the queue.
       if (this.shouldRetrieveMoreReserveEntries()) {
         await this.maybeRetrieveReserveEntries({ abortSignal });
       }
@@ -399,34 +381,31 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     ) {
       logCycles++;
 
-      const git = await this.plugin.getGit();
-      const timeZoneAdjustedLogs = await runLog({
+      const timezoneAdjustedLogs = await runLog({
         abortSignal,
         filePath: startingFilePath,
         lowerBoundaryCommit: undefined,
         maxCount: logMaxCount,
-        git,
-        renameDetectionStrictness:
-          this.plugin.settings.renameDetectionStrictness,
-        timeZone: getTimeZone(this.plugin),
+        plugin: this.plugin,
         upperBoundaryCommit: startingCommit
       });
 
       // All we need from a version is its latest commit, not all commits included in that interval
       const extractedVersions = await extractLastCommitsForInterval({
-        dayStartHour: this.plugin.settings.dayStartHour,
+        changelogGenerationSettings:
+          this.plugin.settings.changelogGenerationSettings,
         interval,
         previouslySeenFullyAdjustedDates: fullyAdjustedSeenDates,
-        timeZoneAdjustedLogs
+        timezoneAdjustedLogs
       });
 
-      if (timeZoneAdjustedLogs.length < logMaxCount) {
+      if (timezoneAdjustedLogs.length < logMaxCount) {
         reachedInitialCommit = true;
       }
       // If getting file changelog versions and need to loop many times, we need to track the file path across renames so that we can follow the target file across its whole history.
-      startingFilePath = timeZoneAdjustedLogs.at(-1)?.filePath;
+      startingFilePath = timezoneAdjustedLogs.at(-1)?.filePath;
 
-      startingCommit = timeZoneAdjustedLogs.at(-1)?.hash;
+      startingCommit = timezoneAdjustedLogs.at(-1)?.hash;
 
       lastCommitsInEachVersion.push(...extractedVersions);
 
@@ -509,12 +488,10 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
     if (this.shouldRetrieveMoreReserveEntries()) {
       await this.retrieveMoreEntries({
         abortSignal,
-
-        filePath: assertNotNull(
-          this.oldestCachedVersion
-        ).getPotentialGitFilePath(),
-
-        upperBoundaryCommit: assertNotNull(this.oldestCachedVersion).commitHash
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        filePath: this.oldestCachedVersion!.getPotentialGitFilePath(),
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        upperBoundaryCommit: this.oldestCachedVersion!.commitHash
       });
     }
   }
@@ -542,7 +519,8 @@ export abstract class ChangelogManager<T extends ChangelogEntry> {
       return;
     }
 
-    const oldestNewEntry = assertNotNull(newEntries.at(-1));
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const oldestNewEntry = newEntries.at(-1)!;
     // If updating the latest incomplete version, keep the isCollapsed state from current view. (File changelog entries aren't collapsible)
     if (
       oldestNewEntry instanceof VaultChangelogEntry &&

src/core/FileChangelogManager.ts

@@ -1,8 +1,6 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
 import type { FileChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
 import type GitChangelogPlugin from 'main.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { GitChangelogSettings } from 'settings/settings.ts';
+import type { GitChangelogPluginSettings } from 'settings/settings.ts';
 import type { TaskManager } from 'TaskManager.svelte.ts';
 import type { ReadonlyDeep } from 'type-fest';
 import type { ChangelogInterval, FileLogEntry } from 'types.ts';
@@ -14,18 +12,21 @@ import {
 } from 'constants.ts';
 import { ChangelogManager } from 'core/ChangelogManager.svelte.ts';
 import { runFileDiff } from 'core/gitOperations/runFileDiff.ts';
-import { deepEqual } from 'obsidian-dev-utils/Object';
-import { pickFileChangelogSettings } from 'settings/settings.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
+import { validateChangelogInterval } from 'settings/validation/changelogInterval.ts';
 
 export class FileChangelogManager extends ChangelogManager<FileChangelogEntry> {
   public constructor({
+    // ActiveGitFile,
     plugin,
     taskManager
   }: {
+    // ActiveGitFile?: string;
     plugin: GitChangelogPlugin;
     taskManager: TaskManager;
   }) {
     super({ plugin, taskManager });
+    // This.cachedActiveGitFile = activeGitFile;
   }
 
   /**
@@ -46,35 +47,23 @@ export class FileChangelogManager extends ChangelogManager<FileChangelogEntry> {
   }
 
   public override async setNextInterval(): Promise<void> {
-    await this.plugin.settingsManager.editAndSave(
-      (settings: GitChangelogSettings): void => {
-        settings.fileChangelogInterval = this.getNextInterval();
-      },
-      true
-    );
-    this.plugin.app.workspace.trigger(
-      'git-changelog:file-changelog-generation-settings-changed'
-    );
-  }
+    const newSettings = this.plugin.settingsClone;
 
-  public override specificSettingsChanged(
-    oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >
-  ): boolean {
-    const oldVaultGenerationSettings = pickFileChangelogSettings(oldSettings);
-    const newVaultGenerationSettings = pickFileChangelogSettings(newSettings);
+    newSettings.fileChangelogInterval = this.getNextInterval();
 
-    return !deepEqual(oldVaultGenerationSettings, newVaultGenerationSettings);
+    await this.plugin.saveSettings(newSettings, false);
   }
 
   public override getInterval(
-    settings: ReadonlyDeep<GitChangelogSettings> = this.plugin.settings
+    settings: ReadonlyDeep<GitChangelogPluginSettings> = this.plugin.settings
   ): ChangelogInterval {
-    return settings.fileChangelogInterval;
+    const interval = settings.fileChangelogInterval;
+
+    if (!validateChangelogInterval(interval)) {
+      return DEFAULT_SETTINGS.fileChangelogInterval;
+    }
+
+    return interval;
   }
 
   protected override async loadEntries({
@@ -135,17 +124,11 @@ export class FileChangelogManager extends ChangelogManager<FileChangelogEntry> {
     newCommit: FileLogEntry;
     oldCommit?: FileLogEntry;
   }): Promise<FileChangelogEntry | undefined> {
-    const git = await this.plugin.getGit();
     return await runFileDiff({
       abortSignal,
       newCommit,
       oldCommit,
-      plugin: this.plugin,
-      diffAlgorithm: this.plugin.settings.diffAlgorithm,
-      whitespaceIgnoreMode: this.plugin.settings.whitespaceIgnoreMode,
-      ignoreBlankLines: this.plugin.settings.ignoreBlankLines,
-      emptyTreeHash: await this.plugin.getEmptyTreeHash(),
-      git
+      plugin: this.plugin
     });
   }
 

src/core/VaultChangelogManager.ts

@@ -1,8 +1,6 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
 import type { VaultChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
 import type GitChangelogPlugin from 'main.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { GitChangelogSettings } from 'settings/settings.ts';
+import type { GitChangelogPluginSettings } from 'settings/settings.ts';
 import type { TaskManager } from 'TaskManager.svelte.ts';
 import type { ReadonlyDeep } from 'type-fest';
 import type { ChangelogInterval, LogEntry } from 'types.ts';
@@ -14,8 +12,8 @@ import {
 } from 'constants.ts';
 import { ChangelogManager } from 'core/ChangelogManager.svelte.ts';
 import { runRepoDiff } from 'core/gitOperations/runRepoDiff.ts';
-import { deepEqual } from 'obsidian-dev-utils/Object';
-import { pickVaultChangelogSettings } from 'settings/settings.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
+import { validateChangelogInterval } from 'settings/validation/changelogInterval.ts';
 
 export class VaultChangelogManager extends ChangelogManager<VaultChangelogEntry> {
   private collapseFirstVersion: boolean | undefined;
@@ -40,44 +38,42 @@ export class VaultChangelogManager extends ChangelogManager<VaultChangelogEntry>
   }
 
   public override resetAndGetSignal(): AbortSignal {
-    const firstEntryExists = this.visibleEntries?.at(0);
-    // Preserves the first entry collapsed state when users shuffles intervals and triggers multiple recomputes before any of them have the chance to finish.
-    if (firstEntryExists) {
-      this.collapseFirstVersion = firstEntryExists.isCollapsed;
-    }
+    this.collapseFirstVersion = this.visibleEntries?.at(0)?.isCollapsed;
     return super.resetAndGetSignal();
   }
 
   public override async setNextInterval(): Promise<void> {
-    await this.plugin.settingsManager.editAndSave(
-      (settings: GitChangelogSettings): void => {
-        settings.vaultChangelogInterval = this.getNextInterval();
-      },
-      true
-    );
-    this.plugin.app.workspace.trigger(
-      'git-changelog:vault-changelog-generation-settings-changed'
-    );
+    const newSettings = this.plugin.settingsClone;
+
+    newSettings.vaultChangelogGenerationSettings.interval =
+      this.getNextInterval();
+
+    await this.plugin.saveSettings(newSettings, false);
   }
 
-  public override specificSettingsChanged(
-    oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >
+  public override generationSettingsChanged(
+    oldSettings: ReadonlyDeep<GitChangelogPluginSettings>,
+    newSettings: GitChangelogPluginSettings
   ): boolean {
-    const oldVaultGenerationSettings = pickVaultChangelogSettings(oldSettings);
-    const newVaultGenerationSettings = pickVaultChangelogSettings(newSettings);
-
-    return !deepEqual(oldVaultGenerationSettings, newVaultGenerationSettings);
+    if (
+      oldSettings.vaultChangelogGenerationSettings.gitDiffIgnore !==
+      newSettings.vaultChangelogGenerationSettings.gitDiffIgnore
+    ) {
+      return true;
+    }
+    return super.generationSettingsChanged(oldSettings, newSettings);
   }
 
   public override getInterval(
-    settings: ReadonlyDeep<GitChangelogSettings> = this.plugin.settings
+    settings: ReadonlyDeep<GitChangelogPluginSettings> = this.plugin.settings
   ): ChangelogInterval {
-    return settings.vaultChangelogInterval;
+    const interval = settings.vaultChangelogGenerationSettings.interval;
+
+    if (!validateChangelogInterval(interval)) {
+      return DEFAULT_SETTINGS.vaultChangelogGenerationSettings.interval;
+    }
+
+    return interval;
   }
 
   protected override calculateVersionsToAppend(resetCache: boolean): number {
@@ -95,23 +91,11 @@ export class VaultChangelogManager extends ChangelogManager<VaultChangelogEntry>
     newCommit: LogEntry;
     oldCommit?: LogEntry;
   }): Promise<undefined | VaultChangelogEntry> {
-    const git = await this.plugin.getGit();
     return await runRepoDiff({
       abortSignal,
       newCommit,
       oldCommit,
-      plugin: this.plugin,
-      git,
-      diffAlgorithm: this.plugin.settings.diffAlgorithm,
-      renameLimit: this.plugin.settings.renameLimit,
-      renameDetectionStrictness: this.plugin.settings.renameDetectionStrictness,
-      emptyTreeHash: await this.plugin.getEmptyTreeHash(),
-      excludeFilesAndFoldersLines:
-        this.plugin.settings.excludeFilesAndFoldersLines,
-      enableExclusionList: this.plugin.settings.enableExclusionList,
-      convertToIncludeList: this.plugin.settings.convertToIncludeList,
-      whitespaceIgnoreMode: this.plugin.settings.whitespaceIgnoreMode,
-      ignoreBlankLines: this.plugin.settings.ignoreBlankLines
+      plugin: this.plugin
     });
   }
 

src/core/findFirstFileCommitBefore.ts

@@ -1,86 +0,0 @@
-import type { SimpleGit } from 'simple-git';
-import type { LogEntry } from 'types.ts';
-
-import { runLog } from 'core/gitOperations/runLog.ts';
-import spacetime from 'spacetime';
-import { AbortError } from 'types.ts';
-import { assertNotNull } from 'utils.ts';
-
-// Assumes the average neighboring commits are 5 minutes apart
-const AVERAGE_COMMIT_FREQUENCY_MINUTES = 5;
-
-export async function findFirstFileCommitBefore({
-  abortSignal,
-  filePath,
-  minutes,
-  timeZone,
-  git,
-  renameDetectionStrictness
-}: {
-  abortSignal: AbortSignal;
-  filePath: string;
-  minutes: number;
-  timeZone: string;
-  git: SimpleGit;
-  renameDetectionStrictness: number;
-}): Promise<LogEntry | undefined> {
-  // eslint-disable-next-line no-magic-numbers
-  const maxCount = Math.ceil(minutes / AVERAGE_COMMIT_FREQUENCY_MINUTES) + 20;
-
-  let firstEntriesOutsideInterval: LogEntry[] = [];
-  let startingFilePath = filePath;
-  const currentTime = spacetime.now(timeZone);
-  let startingCommit: string | undefined;
-
-  while (
-    // If it's the first run
-    !firstEntriesOutsideInterval.at(-1) ||
-    // Only continue if commit(s) that happened before the specified interval aren't reached yet.
-
-    assertNotNull(firstEntriesOutsideInterval.at(-1)).timeZoneAdjustedDate.diff(
-      currentTime,
-
-      'minutes'
-    ) <
-      // Not <=
-      minutes
-  ) {
-    firstEntriesOutsideInterval = await runLog({
-      abortSignal,
-      filePath: startingFilePath,
-      lowerBoundaryCommit: undefined,
-      maxCount,
-      upperBoundaryCommit: startingCommit,
-      git,
-      renameDetectionStrictness,
-      timeZone
-    });
-
-    if (firstEntriesOutsideInterval.length < maxCount) {
-      // Reached initial commit, can't go back any further, exit the loop.
-      break;
-    }
-
-    // If getting file changelog versions and need to loop many times, we need to track the file path across renames so that we can follow the target file across its whole history.
-
-    startingFilePath = assertNotNull(
-      assertNotNull(firstEntriesOutsideInterval.at(-1)).filePath
-    );
-
-    startingCommit = assertNotNull(firstEntriesOutsideInterval.at(-1)).hash;
-  }
-
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
-  // We just need to get the most recent commit that's still outside the interval.
-  for (const entry of firstEntriesOutsideInterval) {
-    if (entry.timeZoneAdjustedDate.diff(currentTime, 'minutes') >= minutes) {
-      return entry;
-    }
-  }
-
-  // If all commits fall inside the interval, or file isn't in the repo
-  return undefined;
-}

src/core/gitOperations/findFirstCommitBefore.ts

@@ -1,44 +1,27 @@
-import type { LogResult, SimpleGit } from 'simple-git';
+import type GitChangelogPlugin from 'main.ts';
 import type { LogEntry } from 'types.ts';
 
+import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
+import { getRenameDetectionStrictness } from 'settings/ui/RenameDetectionStrictnessSlider.ts';
 import spacetime from 'spacetime';
 import { AbortError } from 'types.ts';
-import { assertNotNull } from 'utils.ts';
 
-/**
- * Returns the first commit before the specified date or the specified number of minutes.
- * If no commits are found, returns undefined.
- *
- * Either `minutes` or `isoString` must be provided.
- *
- * @param abortSignal - The abort signal to cancel the operation.
- * @param minutes - The number of minutes to look back from now.
- * @param isoString - The ISO string to look back from.
- * @param git - The SimpleGit instance.
- * @param timeZone - The time zone to adjust the commit date to.
- */
 export async function findFirstCommitBefore({
   abortSignal,
+  filePath,
   minutes,
-  isoString,
-  git,
-  timeZone
+  plugin
 }: {
   abortSignal: AbortSignal;
-  minutes?: number;
-  isoString?: string;
-  git: SimpleGit;
-
-  timeZone: string;
+  filePath: string;
+  minutes: number;
+  plugin: GitChangelogPlugin;
 }): Promise<LogEntry | undefined> {
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
   const options: Record<string, unknown> = {
+    ...(filePath ? { file: filePath } : {}),
     // "--no-patch": null,
     // eslint-disable-next-line no-magic-numbers
-    '--before': isoString ?? `${assertNotNull(minutes) * 60 - 3} seconds ago`,
+    '--before': `${minutes * 60 - 3} seconds ago`,
     '--diff-merges': 'first-parent',
     format: {
       date: '%cI',
@@ -49,14 +32,27 @@ export async function findFirstCommitBefore({
     strictDate: true
   };
 
-  let result: LogResult;
-  try {
-    result = await git.log(options);
-  } catch {
-    // E.g. error when there are no commits in the repo
-    return undefined;
+  if (filePath) {
+    options['--name-status'] = null;
+    // --name-only
+    options['--follow'] = null;
+
+    const renameDetectionStrictness = getRenameDetectionStrictness(
+      plugin.settings.changelogGenerationSettings
+    );
+    options['--find-renames'] = `${renameDetectionStrictness.toString()}%`;
   }
 
+  if (abortSignal.aborted) {
+    throw new AbortError();
+  }
+  const git = await plugin.getGit();
+  const result = await git.log(options);
+  const timezone = getTimeZone(
+    plugin.settings.changelogGenerationSettings,
+    plugin
+  );
+
   if (abortSignal.aborted) {
     throw new AbortError();
   }
@@ -66,11 +62,10 @@ export async function findFirstCommitBefore({
     return undefined;
   }
 
-  return result.all
-    .map<LogEntry>((entry) => ({
-      filePath: undefined,
-      hash: entry.hash,
-      timeZoneAdjustedDate: spacetime(entry.date).goto(timeZone)
-    }))
-    .at(0);
+  return result.all.map<LogEntry>((entry) => ({
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    filePath: entry.diff!.files.first()!.file,
+    hash: entry.hash,
+    timezoneAdjustedDate: spacetime(entry.date).goto(timezone)
+  }))[0];
 }

src/core/gitOperations/getCommitTimestamp.ts

@@ -1,63 +0,0 @@
-import type { LogResult, SimpleGit } from 'simple-git';
-import type { LogEntry } from 'types.ts';
-
-import spacetime from 'spacetime';
-import { AbortError } from 'types.ts';
-
-/**
- * Returns undefined if an error happens during a git log. For example, passed a non-existent commit hash or if there are no commits in the repo.
- */
-export async function getCommitTimestampOrUndefined({
-  abortSignal,
-  commitHash,
-  git,
-  timeZone
-}: {
-  abortSignal: AbortSignal;
-  commitHash?: string;
-  git: SimpleGit;
-  timeZone: string;
-}): Promise<LogEntry | undefined> {
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
-  const options: Record<string, unknown> = {
-    // "--no-patch": null,
-
-    '--diff-merges': 'first-parent',
-    format: {
-      date: '%cI',
-      hash: '%H'
-    },
-    maxCount: 1,
-    // Splitter: '\0',
-    strictDate: true
-  };
-  if (commitHash) {
-    options[commitHash] = null;
-  }
-
-  let result: LogResult;
-  try {
-    result = await git.log(options);
-  } catch {
-    return undefined;
-  }
-  // eslint-disable-next-line eqeqeq
-  if (result?.latest == null) {
-    return undefined;
-  }
-
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
-  return result.all
-    .map<LogEntry>((entry) => ({
-      filePath: undefined,
-      hash: entry.hash,
-      timeZoneAdjustedDate: spacetime(entry.date).goto(timeZone)
-    }))
-    .at(0);
-}

src/core/gitOperations/getEmptyTreeHash.ts

@@ -0,0 +1,34 @@
+import type GitChangelogPlugin from 'main.ts';
+
+async function runHashObjectEmptyTree({
+  plugin
+}: {
+  plugin: GitChangelogPlugin;
+}): Promise<string> {
+  const git = await plugin.getGit();
+
+  const emptyTreeHash = await git.raw([
+    'hash-object',
+    '-t',
+    'tree',
+    '/dev/null'
+  ]);
+
+  return emptyTreeHash.trim();
+}
+
+export async function getEmptyTreeHash({
+  plugin
+}: {
+  plugin: GitChangelogPlugin;
+}): Promise<string> {
+  if (plugin.emptyTreeHash) {
+    return plugin.emptyTreeHash;
+  }
+
+  const emptyTreeHash = await runHashObjectEmptyTree({ plugin });
+  if (!plugin.emptyTreeHash) {
+    plugin.emptyTreeHash = emptyTreeHash;
+  }
+  return plugin.emptyTreeHash;
+}

src/core/gitOperations/helper.ts

@@ -1,7 +1,9 @@
+import type GitChangelogPlugin from 'main.ts';
 import type { DiffFile, FilesSummary } from 'types.ts';
 
 import { normalizePath } from 'obsidian';
-import { DiffAlgorithm, DiffFileStatus, WhitespaceIgnoreMode } from 'types.ts';
+import { getDiffAlgorithm } from 'settings/ui/DiffAlgorithmOptions.ts';
+import { DiffAlgorithm, DiffFileStatus } from 'types.ts';
 import { getFileNameFromPath } from 'utils.ts';
 import { getDisplayExtensionFromPath } from 'Views/formatters.ts';
 
@@ -14,20 +16,17 @@ export function addFileStatusToSummary(
   } else if (status === DiffFileStatus.Deleted) {
     file.deletedFiles++;
   } else if (isFileRenamedOrMoved(status)) {
-    file.renamedAndMovedFiles++;
+    file.renamedFiles++;
   } else {
     file.modifiedFiles++;
   }
 }
 
-export function assignDiffAlgorithm({
-  arguments_,
-  diffAlgorithm
-}: {
-  arguments_: string[];
-  diffAlgorithm: DiffAlgorithm;
-}): void {
-  switch (diffAlgorithm) {
+export function assignDiffAlgorithm(
+  arguments_: string[],
+  plugin: GitChangelogPlugin
+): void {
+  switch (getDiffAlgorithm(plugin.settings.changelogGenerationSettings)) {
     case DiffAlgorithm.Default: {
       arguments_.push('--diff-algorithm=default');
       break;
@@ -44,38 +43,6 @@ export function assignDiffAlgorithm({
   }
 }
 
-export function assignWhitespaceIgnoreSettings({
-  arguments_,
-  whitespaceIgnoreMode,
-  ignoreBlankLines
-}: {
-  arguments_: string[];
-  whitespaceIgnoreMode: WhitespaceIgnoreMode;
-  ignoreBlankLines: boolean;
-}): void {
-  switch (whitespaceIgnoreMode) {
-    case WhitespaceIgnoreMode.None: {
-      break;
-    }
-    case WhitespaceIgnoreMode.SpaceAtEol: {
-      arguments_.push('--ignore-space-at-eol');
-      break;
-    }
-    case WhitespaceIgnoreMode.SpaceChange: {
-      arguments_.push('--ignore-space-change');
-      break;
-    }
-    case WhitespaceIgnoreMode.AllSpace: {
-      arguments_.push('--ignore-all-space');
-      break;
-    }
-  }
-
-  if (ignoreBlankLines) {
-    arguments_.push('--ignore-blank-lines');
-  }
-}
-
 export function calculateFileStatusRenamedOrMoved(
   oldPath: string,
   newPath: string
@@ -114,7 +81,7 @@ export function calculatePerFileTypeSummaries({
         addedFiles: 0,
         deletedFiles: 0,
         modifiedFiles: 0,
-        renamedAndMovedFiles: 0
+        renamedFiles: 0
       };
     }
 

src/core/gitOperations/isAncestor.ts

@@ -1,4 +1,4 @@
-import type { SimpleGit } from 'simple-git';
+import type GitChangelogPlugin from 'main.ts';
 
 /**
  * Doesn't work because of the way SimpleGit instance is set up in Git plugin.
@@ -6,15 +6,16 @@ import type { SimpleGit } from 'simple-git';
 export async function isAncestorOf({
   newCommit,
   oldCommit,
-  git
+  plugin
 }: {
   newCommit: string;
   oldCommit: string;
-  git: SimpleGit;
+  plugin: GitChangelogPlugin;
 }): Promise<boolean> {
   if (oldCommit === newCommit) {
     return true;
   }
+  const git = await plugin.getGit();
 
   const result = await git.raw([
     'merge-base',
@@ -22,6 +23,7 @@ export async function isAncestorOf({
     oldCommit,
     newCommit
   ]);
+  // Plugin.consoleDebug(result);
 
   if (result === '1') {
     return true;

src/core/gitOperations/runCheckIgnore.ts

@@ -1,20 +1,22 @@
-import type { SimpleGit } from 'simple-git';
+import type GitChangelogPlugin from 'main.ts';
 
 import { AbortError } from 'types.ts';
 
 export async function runCheckIgnore({
   abortSignal,
   activeGitFile,
-  git
+  plugin
 }: {
   abortSignal: AbortSignal;
   activeGitFile: string;
-  git: SimpleGit;
+  plugin: GitChangelogPlugin;
 }): Promise<boolean> {
   if (abortSignal.aborted) {
     throw new AbortError();
   }
-  const gitCheckIgnoreResult = await git.checkIgnore(activeGitFile);
+  const gitCheckIgnoreResult = await plugin
+    .getGitPlugin()
+    .gitManager.git.checkIgnore(activeGitFile);
 
   if (abortSignal.aborted) {
     throw new AbortError();

src/core/gitOperations/runFileDiff.ts

@@ -1,15 +1,10 @@
 import type GitChangelogPlugin from 'main.ts';
-import type { SimpleGit } from 'simple-git';
-import type {
-  DiffAlgorithm,
-  FileLogEntry,
-  WhitespaceIgnoreMode
-} from 'types.ts';
+import type { FileLogEntry } from 'types.ts';
 
 import { FileChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
+import { getEmptyTreeHash } from 'core/gitOperations/getEmptyTreeHash.ts';
 import {
   assignDiffAlgorithm,
-  assignWhitespaceIgnoreSettings,
   calculateFileStatusRenamedOrMoved
 } from 'core/gitOperations/helper.ts';
 import { AbortError, DiffFileStatus } from 'types.ts';
@@ -18,33 +13,19 @@ export async function runFileDiff({
   abortSignal,
   newCommit,
   oldCommit,
-  plugin,
-  git,
-  diffAlgorithm,
-  whitespaceIgnoreMode,
-  ignoreBlankLines,
-  emptyTreeHash
+  plugin
 }: {
   abortSignal: AbortSignal;
   newCommit: FileLogEntry;
   oldCommit?: FileLogEntry;
-  plugin?: GitChangelogPlugin;
-  git: SimpleGit;
-  diffAlgorithm: DiffAlgorithm;
-  whitespaceIgnoreMode: WhitespaceIgnoreMode;
-  ignoreBlankLines: boolean;
-  emptyTreeHash: string;
+  plugin: GitChangelogPlugin;
 }): Promise<FileChangelogEntry | undefined> {
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
-  const oldVersionIsEmpty =
+  const isInitialVersion =
     oldCommit === undefined || oldCommit.fileDeleted === true;
 
-  if (oldVersionIsEmpty && newCommit.fileDeleted) {
+  if (isInitialVersion && newCommit.fileDeleted) {
     // I assumed that the other should always be defined if one is undefined, since newCommit.hash is only undefined for commits where the file was deleted, and it can't get deleted if it didn't exist before, but these are statuses calculated from comparing neighboring commits, but we are diffing selected commits only, so maybe it's possible that we get in a situation where we compare some initial version commit (that isn't the actual initial commit, so that commit could be a deletion of that file, if a file was newly added and then deleted in the same interval) with an empty state
-    plugin?.consoleDebug(
+    plugin.consoleDebug(
       'oldCommit and newCommit are both undefined, assumption is wrong'
     );
 
@@ -57,23 +38,20 @@ export async function runFileDiff({
     '--no-renames'
     // `--exit-code`,
   ];
-  assignDiffAlgorithm({ arguments_: numstatArguments, diffAlgorithm });
-  assignWhitespaceIgnoreSettings({
-    arguments_: numstatArguments,
-    whitespaceIgnoreMode,
-    ignoreBlankLines
-  });
+  assignDiffAlgorithm(numstatArguments, plugin);
 
   // Only one of these can be true at the same time since we are returning early if they are both true.
-  if (oldVersionIsEmpty || newCommit.fileDeleted) {
+  if (isInitialVersion || newCommit.fileDeleted) {
+    const emptyTreeHash = await getEmptyTreeHash({ plugin });
+
     numstatArguments.push(
       emptyTreeHash,
-      oldVersionIsEmpty ? newCommit.hash : oldCommit.hash,
+      isInitialVersion ? newCommit.hash : oldCommit.hash,
       // This part is important. It tells git where is the explicit separation between revisions and the file path. Without it, git will not always be able to parse the file path correctly.
       '--',
       // We can pass oldCommit.filePath if the new commit is just a deletion of that file, meaning the file names are the same. We just inverse the result later to count the showed additions as deletions.
 
-      oldVersionIsEmpty ? newCommit.filePath : oldCommit.filePath
+      isInitialVersion ? newCommit.filePath : oldCommit.filePath
     );
   } else {
     numstatArguments.push(
@@ -84,7 +62,7 @@ export async function runFileDiff({
 
   let fileStatus: DiffFileStatus;
 
-  if (oldVersionIsEmpty) {
+  if (isInitialVersion) {
     fileStatus = DiffFileStatus.Added;
   } else if (newCommit.fileDeleted) {
     fileStatus = DiffFileStatus.Deleted;
@@ -97,6 +75,11 @@ export async function runFileDiff({
     );
   }
 
+  if (abortSignal.aborted) {
+    throw new AbortError();
+  }
+
+  const git = await plugin.getGit();
   const diffNumstatResult = await git.diffSummary(numstatArguments);
 
   if (
@@ -109,8 +92,8 @@ export async function runFileDiff({
   }
 
   const textDiffStats =
-    // If diff result shows no changes, there will be no entries in files array, so in that case, this will assign empty stats to textDiffStats instead of undefined
-    diffNumstatResult.files.at(0)?.binary === true
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    (newCommit.binary ?? diffNumstatResult.files.at(0)!.binary)
       ? undefined
       : {
           baseStats: {
@@ -128,7 +111,7 @@ export async function runFileDiff({
     pathGitRelative: newCommit.filePath, // Passing oldCommit.filePath or undefined for fileDeleted case could be more logical, but not compatible with use in git commands.
     status: fileStatus,
     textDiffStats,
-    timeZoneAdjustedDate: newCommit.timeZoneAdjustedDate
+    timezoneAdjustedDate: newCommit.timezoneAdjustedDate
   });
   return fileEntry;
 }

src/core/gitOperations/runHashObjectEmptyTree.ts

@@ -1,17 +0,0 @@
-import type { SimpleGit } from 'simple-git';
-
-export async function runHashObjectEmptyTree({
-  git
-}: {
-  git: SimpleGit;
-}): Promise<string> {
-  const emptyTreeHash = await git.raw([
-    'hash-object',
-    '-t',
-    'tree',
-    '/dev/null'
-  ]);
-
-  // Trimming is required.
-  return emptyTreeHash.trim();
-}

src/core/gitOperations/runLog.ts

@@ -1,14 +1,13 @@
-import type { SimpleGit } from 'simple-git';
+import type GitChangelogPlugin from 'main.ts';
+import type { DiffResultNameStatusFile } from 'simple-git';
 import type { LogEntry } from 'types.ts';
 
 import { unescapeGitFileOutput } from 'core/gitOperations/helper.ts';
+import { getTimeZone } from 'settings/ui/CustomTimeZone.ts';
+import { getRenameDetectionStrictness } from 'settings/ui/RenameDetectionStrictnessSlider.ts';
+import { DiffNameStatus } from 'simple-git';
 import spacetime from 'spacetime';
 import { AbortError } from 'types.ts';
-import { assertNotNull } from 'utils.ts';
-
-import type { DiffResultNameStatusFile } from './simpleGitTypes.ts';
-
-import { DiffNameStatus } from './simpleGitTypes.ts';
 
 // Less efficient than running raw?
 export async function runLog({
@@ -16,23 +15,16 @@ export async function runLog({
   filePath,
   lowerBoundaryCommit,
   maxCount,
-  upperBoundaryCommit,
-  timeZone,
-  git,
-  renameDetectionStrictness
+  plugin,
+  upperBoundaryCommit
 }: {
   abortSignal: AbortSignal;
   filePath: string | undefined;
   lowerBoundaryCommit: string | undefined;
   maxCount?: number;
+  plugin: GitChangelogPlugin;
   upperBoundaryCommit: string | undefined;
-  git: SimpleGit;
-  timeZone: string;
-  renameDetectionStrictness: number;
 }): Promise<LogEntry[]> {
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
   // This is confusing, and could be accidentally broken in the future
   const retrievingNewLogs = lowerBoundaryCommit !== undefined;
   const options: Record<string, unknown> = {
@@ -52,10 +44,10 @@ export async function runLog({
     options['--diff-merges'] = 'first-parent';
     options['--name-status'] = null;
 
-    // `--follow` does not work well on non-linear history. It does not work for files that were just renamed in the working directory but haven't been committed yet. It needs commit information to track renames.
-    // This problem can be solved by running a separate git diff name-status command before running git log, to detect potential renames and get the last committed filename of the current file, but the performance impact is not worth it.
+    // --name-only
     options['--follow'] = null;
-    options['--find-renames'] = `${renameDetectionStrictness}%`;
+    options['--find-renames'] =
+      `${getRenameDetectionStrictness(plugin.settings.changelogGenerationSettings)}%`;
   }
 
   if (upperBoundaryCommit) {
@@ -64,17 +56,23 @@ export async function runLog({
     options['--boundary'] = null;
     options[`${lowerBoundaryCommit}..HEAD`] = null;
   }
-
+  if (abortSignal.aborted) {
+    throw new AbortError();
+  }
+  const git = await plugin.getGit();
   const result = await git.log(options);
+  const timezone = getTimeZone(
+    plugin.settings.changelogGenerationSettings,
+    plugin
+  );
 
   const logs: LogEntry[] = [];
   for (const entry of result.all) {
     let fileDeleted: boolean | undefined;
 
     if (filePath) {
-      const file = assertNotNull(entry.diff).files.at(
-        0
-      ) as DiffResultNameStatusFile;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const file = entry.diff!.files.at(0) as DiffResultNameStatusFile;
 
       // Include X (Unknown) statuses and show error states instead of silently ignoring them. (Caused by repository corruption or other issues)
       //
@@ -100,13 +98,14 @@ export async function runLog({
 
     logs.push({
       filePath: filePath
-        ? unescapeGitFileOutput(
-            assertNotNull(assertNotNull(entry.diff).files.at(0)).file
-          )
+        ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          unescapeGitFileOutput(entry.diff!.files.at(0)!.file)
         : undefined,
       hash: entry.hash,
       fileDeleted,
-      timeZoneAdjustedDate: spacetime(entry.date).goto(timeZone)
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      binary: filePath ? entry.diff!.files.at(0)!.binary : undefined,
+      timezoneAdjustedDate: spacetime(entry.date).goto(timezone)
     });
   }
   return logs;

src/core/gitOperations/runRepoDiff.ts

@@ -1,25 +1,19 @@
 /* eslint-disable no-magic-numbers */
 import type GitChangelogPlugin from 'main.ts';
-import type { SimpleGit } from 'simple-git';
-import type {
-  DiffAlgorithm,
-  DiffFile,
-  FilesSummary,
-  LogEntry,
-  TextDiffFile,
-  WhitespaceIgnoreMode
-} from 'types.ts';
+import type { DiffFile, FilesSummary, LogEntry, TextDiffFile } from 'types.ts';
 
 import { VaultChangelogEntry } from 'core/ChangelogEntry.svelte.ts';
+import { getEmptyTreeHash } from 'core/gitOperations/getEmptyTreeHash.ts';
 import {
   addFileStatusToSummary,
   assignDiffAlgorithm,
-  assignWhitespaceIgnoreSettings,
   calculateFileStatusRenamedOrMoved
 } from 'core/gitOperations/helper.ts';
 import { convertGitIgnoreToPathspec } from 'settings/ui/ExcludeFilesAndFolders.ts';
+import { getRenameLimit } from 'settings/ui/RenameDetectionFileLimit.ts';
+import { getRenameDetectionStrictness } from 'settings/ui/RenameDetectionStrictnessSlider.ts';
 import { AbortError, DiffFileStatus } from 'types.ts';
-import { assertNotNull, insertSorted, parseContentChange } from 'utils.ts';
+import { insertSorted, parseContentChange } from 'utils.ts';
 
 import { runRepoDiffStatus } from './runRepoDiffStatus.ts';
 
@@ -59,94 +53,61 @@ export function compareTextFiles(
   return leftFile.pathGitRelative.localeCompare(rightFile.pathGitRelative);
 }
 
-// eslint-disable-next-line complexity
 export async function runRepoDiff({
   abortSignal,
   newCommit,
   oldCommit,
-  git,
-  plugin,
-  excludeFilesAndFoldersLines,
-  convertToIncludeList,
-  renameLimit,
-  renameDetectionStrictness,
-  diffAlgorithm,
-  whitespaceIgnoreMode,
-  ignoreBlankLines,
-  emptyTreeHash,
-  enableExclusionList
+  plugin
 }: {
   abortSignal: AbortSignal;
   newCommit: LogEntry;
   oldCommit?: LogEntry;
-  diffAlgorithm: DiffAlgorithm;
-  git: SimpleGit;
-  excludeFilesAndFoldersLines: readonly string[];
-  enableExclusionList: boolean;
-  plugin?: GitChangelogPlugin;
-  convertToIncludeList: boolean;
-  renameLimit: number;
-  emptyTreeHash: string;
-  renameDetectionStrictness: number;
-  ignoreBlankLines: boolean;
-  whitespaceIgnoreMode: WhitespaceIgnoreMode;
+  plugin: GitChangelogPlugin;
 }): Promise<undefined | VaultChangelogEntry> {
   if (newCommit === undefined) {
-    plugin?.consoleDebug('newCommit is undefined');
+    plugin.consoleDebug('newCommit is undefined');
   }
 
   if (abortSignal.aborted) {
     throw new AbortError();
   }
 
-  const pathSpec = enableExclusionList
-    ? convertGitIgnoreToPathspec(
-        excludeFilesAndFoldersLines,
-        convertToIncludeList
-      )
-    : undefined;
+  const pathSpec = convertGitIgnoreToPathspec(plugin);
 
   const numstatArguments = [
     '--numstat',
-    `-l${renameLimit}`,
-    `--find-renames=${renameDetectionStrictness}%`,
+    `-l${getRenameLimit(plugin.settings.changelogGenerationSettings)}`,
+    `--find-renames=${getRenameDetectionStrictness(plugin.settings.changelogGenerationSettings)}%`,
     '--color-moved=no',
-    // Don't use empty files as rename candidates. If you delete any empty file and add a new empty file, that file will be considered a rename unless this flag is used.
     '--no-rename-empty',
     '-z'
   ];
-  assignDiffAlgorithm({ arguments_: numstatArguments, diffAlgorithm });
-  assignWhitespaceIgnoreSettings({
-    arguments_: numstatArguments,
-    whitespaceIgnoreMode,
-    ignoreBlankLines
-  });
+  assignDiffAlgorithm(numstatArguments, plugin);
 
   let statusResult: Record<string, DiffFileStatus> | undefined;
 
   if (oldCommit === undefined) {
+    const emptyTreeHash = await getEmptyTreeHash({ plugin });
     numstatArguments.push(emptyTreeHash, newCommit.hash);
   } else {
     statusResult = await runRepoDiffStatus({
       newCommit: newCommit.hash,
       oldCommit: oldCommit.hash,
       pathSpec,
-      plugin,
-      abortSignal,
-      git
+      plugin
     });
     numstatArguments.push(oldCommit.hash, newCommit.hash);
   }
 
-  if (pathSpec && pathSpec.length > 0) {
+  if (pathSpec.length > 0) {
     numstatArguments.push('--', ...pathSpec);
   }
 
-  const diffNumstatResult = await git.diff(numstatArguments);
-
   if (abortSignal.aborted) {
     throw new AbortError();
   }
+  const git = await plugin.getGit();
+  const diffNumstatResult = await git.diff(numstatArguments);
 
   const records = diffNumstatResult.split('\0').filter((token) => token !== '');
 
@@ -158,13 +119,13 @@ export async function runRepoDiff({
     addedFiles: 0,
     deletedFiles: 0,
     modifiedFiles: 0,
-    renamedAndMovedFiles: 0
+    renamedFiles: 0
   };
   const binaryFilesSummary: FilesSummary = {
     addedFiles: 0,
     deletedFiles: 0,
     modifiedFiles: 0,
-    renamedAndMovedFiles: 0
+    renamedFiles: 0
   };
 
   const textFiles: DiffFile[] = [];
@@ -203,11 +164,13 @@ export async function runRepoDiff({
       status = DiffFileStatus.Added;
     } else if (oldPath) {
       if (typeof oldPath !== 'string') {
-        plugin?.consoleDebug('oldPath is not a string', oldPath);
+        plugin.consoleDebug('oldPath is not a string!', oldPath);
       }
       status = calculateFileStatusRenamedOrMoved(oldPath, filePath);
-    } else if (assertNotNull(statusResult)[filePath]) {
-      status = assertNotNull(statusResult)[filePath];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    } else if (statusResult![filePath]) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      status = statusResult![filePath];
     } else {
       status = DiffFileStatus.Modified;
     }
@@ -244,10 +207,10 @@ export async function runRepoDiff({
     binaryFiles,
     binaryFilesSummaryCached: binaryFilesSummary,
     commitHash: newCommit.hash,
-    previousVersionLastCommitHash: oldCommit?.hash,
+    previousDayLastCommitHash: oldCommit?.hash,
     textFiles,
     textFilesSummaryCached: textFilesSummary,
-    timeZoneAdjustedDate: newCommit.timeZoneAdjustedDate
+    timezoneAdjustedDate: newCommit.timezoneAdjustedDate
   });
 
   return dayEntry;

src/core/gitOperations/runRepoDiffStatus.ts

@@ -1,11 +1,8 @@
 import type GitChangelogPlugin from 'main.ts';
-import type { SimpleGit } from 'simple-git';
+import type { DiffResultNameStatusFile } from 'simple-git';
 
-import { AbortError, DiffFileStatus } from 'types.ts';
-
-import type { DiffResultNameStatusFile } from './simpleGitTypes.ts';
-
-import { DiffNameStatus } from './simpleGitTypes.ts';
+import { DiffNameStatus } from 'simple-git';
+import { DiffFileStatus } from 'types.ts';
 
 /**
  * Check the number of changed files and if they are added, modified or deleted. this function is needed because git diff --numstat doesn't say if a file is added or deleted
@@ -14,21 +11,13 @@ export async function runRepoDiffStatus({
   newCommit,
   oldCommit,
   pathSpec,
-  git,
-  plugin,
-  abortSignal
+  plugin
 }: {
   newCommit: string;
   oldCommit?: string;
-  pathSpec: string[] | undefined;
-  plugin?: GitChangelogPlugin;
-  abortSignal: AbortSignal;
-  git: SimpleGit;
+  pathSpec: string[];
+  plugin: GitChangelogPlugin;
 }): Promise<Record<string, DiffFileStatus> | undefined> {
-  if (abortSignal.aborted) {
-    throw new AbortError();
-  }
-
   if (oldCommit === undefined) {
     return undefined;
   }
@@ -39,17 +28,14 @@ export async function runRepoDiffStatus({
     // Turns off rename detection, even when the configuration file gives the default to run rename detection.
     '--no-renames'
   ];
-
-  // We don't have to assign the DiffAlgorithm and the WhitespaceIgnoreMode settings because the set that this function returns is just going to be used as a helper set in the runRepoDiff function for assigning an added or deleted file status to changed files that were detected in runRepoDiff using all the proper settings.
-  // If after applying the diff settings, some changed files in runRepoDiff become identical, the runRepoDiff function will simply skip those, and those same files that were detected as changes in this function are never going to be accessed, so they can't return incorrect file statuses.
-  // Also, crossing the rename threshold because of diff settings mismatch isn't a concern since this function isn't used to determine renamed file statuses.
-
-  if (pathSpec && pathSpec.length > 0) {
+  if (pathSpec.length > 0) {
     diffStatusArguments.push('--', ...pathSpec);
   }
+  const git = await plugin.getGit();
   const diffStatusResult = await git.diffSummary(diffStatusArguments);
 
   const changedFilesMap: Record<string, DiffFileStatus> = {};
+
   for (const file of diffStatusResult.files as DiffResultNameStatusFile[]) {
     switch (file.status) {
       case DiffNameStatus.ADDED: {
@@ -68,7 +54,7 @@ export async function runRepoDiffStatus({
             file.status ?? DiffNameStatus.MODIFIED
           )
         ) {
-          plugin?.consoleDebug(
+          plugin.consoleDebug(
             `Unexpected file status of ${file.file}:`,
             file.status
           );

src/core/gitOperations/runWorkingDirFileDiff.ts

@@ -1,17 +1,10 @@
 /* eslint-disable unicorn/prevent-abbreviations */
-import type { SimpleGit } from 'simple-git';
-import type {
-  DiffAlgorithm,
-  LogEntry,
-  TextDiffBaseStats,
-  WhitespaceIgnoreMode
-} from 'types.ts';
+import type GitChangelogPlugin from 'main.ts';
+import type { LogEntry, TextDiffBaseStats } from 'types.ts';
 
-import {
-  assignDiffAlgorithm,
-  assignWhitespaceIgnoreSettings
-} from 'core/gitOperations/helper.ts';
+import { assignDiffAlgorithm } from 'core/gitOperations/helper.ts';
 import { AbortError } from 'types.ts';
+import { parseContentChange } from 'utils.ts';
 
 /**
  * Used for status bar stats.
@@ -19,52 +12,45 @@ import { AbortError } from 'types.ts';
 export async function runWorkingDirFileDiff({
   abortSignal,
   oldCommit,
-  activeGitFile,
-  git,
-  diffAlgorithm,
-  whitespaceIgnoreMode,
-  ignoreBlankLines
+  plugin
 }: {
-  diffAlgorithm: DiffAlgorithm;
   abortSignal: AbortSignal;
   oldCommit: LogEntry;
-  activeGitFile: string;
-  git: SimpleGit;
-  whitespaceIgnoreMode: WhitespaceIgnoreMode;
-  ignoreBlankLines: boolean;
+  plugin: GitChangelogPlugin;
 }): Promise<TextDiffBaseStats | undefined> {
+  const numstatArguments = [
+    '--numstat',
+    '--color-moved=no',
+    '-z',
+    '--no-renames',
+    oldCommit.hash,
+    `${oldCommit.filePath}`
+  ];
+
+  assignDiffAlgorithm(numstatArguments, plugin);
+
   if (abortSignal.aborted) {
     throw new AbortError();
   }
 
-  // Status bar calculations should handle cases of undefined oldCommit and oldCommit.fileDeleted === true before reaching this function
+  const git = await plugin.getGit();
+  const diffNumstatResult = await git.diff(numstatArguments);
 
-  const numstatArguments = ['--numstat', '--color-moved=no', '--no-renames'];
+  const parts = diffNumstatResult.split('\t');
+  const addedString = parts[0];
+  const deletedString = parts[1];
 
-  // Must come before the commit hashes and file paths
-  assignDiffAlgorithm({ arguments_: numstatArguments, diffAlgorithm });
-  assignWhitespaceIgnoreSettings({
-    arguments_: numstatArguments,
-    whitespaceIgnoreMode,
-    ignoreBlankLines
-  });
+  // Determine if this is a binary file or submodule.
+  const isBinary = addedString === '-' && deletedString === '-';
 
-  numstatArguments.push(
-    `${oldCommit.hash}:${oldCommit.filePath}`,
-    activeGitFile
-  );
+  // Parse numeric values for text files.
+  const textDiffStats = isBinary
+    ? undefined
+    : parseContentChange({ addedStr: addedString, deletedStr: deletedString });
 
-  const diffNumstatResult = await git.diffSummary(numstatArguments);
-
-  const textDiffStats =
-    diffNumstatResult.files.at(0)?.binary === true
-      ? undefined
-      : {
-          baseStats: {
-            additions: diffNumstatResult.insertions,
-            deletions: diffNumstatResult.deletions
-          }
-        };
+  if (abortSignal.aborted) {
+    throw new AbortError();
+  }
 
   return textDiffStats?.baseStats;
 }

src/core/gitOperations/simpleGitTypes.ts

@@ -1,25 +0,0 @@
-export enum DiffNameStatus {
-  ADDED = 'A',
-  COPIED = 'C',
-  DELETED = 'D',
-  MODIFIED = 'M',
-  RENAMED = 'R',
-  CHANGED = 'T',
-  UNMERGED = 'U',
-  UNKNOWN = 'X',
-  BROKEN = 'B'
-}
-
-export interface DiffResultNameStatusFile extends DiffResultTextFile {
-  status?: DiffNameStatus;
-  from?: string;
-  similarity: number;
-}
-
-export interface DiffResultTextFile {
-  file: string;
-  changes: number;
-  insertions: number;
-  deletions: number;
-  binary: false;
-}

src/core/helper.ts

@@ -1,12 +1,9 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 import type { Spacetime, TimeUnit } from 'spacetime';
-import type { ReadonlyDeep } from 'type-fest';
 import type { ChangelogInterval, FilesSummary, LogEntry } from 'types.ts';
 
-import { deepEqual } from 'obsidian-dev-utils/Object';
-import { pickGeneralChangelogSettings } from 'settings/settings.ts';
-import { applyDayStartHourSetting } from 'timeUtils.ts';
+import { getDayStartTime } from 'settings/ui/DayStartTime.ts';
+import { applyDayStartTimeSetting } from 'timeUtils.ts';
 
 export const GIT_MAX_CONCURRENT_PROCESSES = 6;
 
@@ -16,7 +13,7 @@ export function addStatsToSummary(
 ): void {
   mainSummary.addedFiles += stats.addedFiles;
   mainSummary.deletedFiles += stats.deletedFiles;
-  mainSummary.renamedAndMovedFiles += stats.renamedAndMovedFiles;
+  mainSummary.renamedFiles += stats.renamedFiles;
   mainSummary.modifiedFiles += stats.modifiedFiles;
 }
 
@@ -71,24 +68,24 @@ export async function isSameAsync({
 }
 
 export async function extractLastCommitsForInterval({
+  changelogGenerationSettings,
   interval,
   previouslySeenFullyAdjustedDates,
-  timeZoneAdjustedLogs,
-  dayStartHour
+  timezoneAdjustedLogs
 }: {
+  changelogGenerationSettings: ChangelogGenerationSettings;
   interval: ChangelogInterval;
   previouslySeenFullyAdjustedDates?: Set<Spacetime>;
-  timeZoneAdjustedLogs: LogEntry[];
-  dayStartHour: number;
+  timezoneAdjustedLogs: LogEntry[];
 }): Promise<LogEntry[]> {
   const lastCommitsInEachInterval: LogEntry[] = [];
   const fullyAdjustedSeenDates =
     previouslySeenFullyAdjustedDates ?? new Set<Spacetime>();
 
-  for (const log of timeZoneAdjustedLogs) {
-    const fullyAdjustedLogDate = applyDayStartHourSetting({
-      dayStartHour,
-      timeZoneAdjustedDate: log.timeZoneAdjustedDate
+  for (const log of timezoneAdjustedLogs) {
+    const fullyAdjustedLogDate = applyDayStartTimeSetting({
+      dayStartTime: getDayStartTime(changelogGenerationSettings),
+      timezoneAdjustedDate: log.timezoneAdjustedDate
     });
 
     const logDateAlreadySeen = await dateAlreadySeen({
@@ -105,24 +102,3 @@ export async function extractLastCommitsForInterval({
 
   return lastCommitsInEachInterval;
 }
-
-export function changelogGenerationSettingsChanged({
-  newSettings,
-  oldSettings
-}: {
-  newSettings: ReadonlyDeep<
-    ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-  >;
-  oldSettings: ReadonlyDeep<
-    ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-  >;
-}): boolean {
-  const oldVaultGenerationSettings = pickGeneralChangelogSettings(oldSettings);
-  const newVaultGenerationSettings = pickGeneralChangelogSettings(newSettings);
-
-  // IsAncestor run
-
-  // Don't have to check if the detected system time zone or detected locale changed since they're only assigned once at startup.
-
-  return !deepEqual(oldVaultGenerationSettings, newVaultGenerationSettings);
-}

src/gitPluginTypes.ts

@@ -62,5 +62,25 @@ declare module 'obsidian' {
       callback: () => void,
       context?: unknown
     ): EventRef;
+
+    on(
+      name: 'obsidian-git:menu',
+      callback: (
+        menu: Menu,
+        path: string,
+        source: string,
+        leaf?: WorkspaceLeaf
+      ) => unknown,
+      context?: unknown
+    ): EventRef;
+    trigger(name: string, ...data: unknown[]): void;
+
+    trigger(
+      name: 'obsidian-git:menu',
+      menu: Menu,
+      path: string,
+      source: string,
+      leaf?: WorkspaceLeaf
+    ): void;
   }
 }

src/menu.ts

@@ -1,286 +0,0 @@
-import type GitChangelogPlugin from 'main.ts';
-import type { WorkspaceLeaf } from 'obsidian';
-import type { GitChangelogSettings } from 'settings/settings.ts';
-
-import { COPY_COMMIT_HASH_ICON, PLUGIN_NAME_SENTENCE_CASE } from 'constants.ts';
-import { Menu, TFolder } from 'obsidian';
-import {
-  convertPathToGitIgnoreRule,
-  parseGitIgnoreLine
-} from 'settings/ui/ExcludeFilesAndFolders.ts';
-import { assertNotNull } from 'utils.ts';
-import { fileOpenableInObsidian } from 'Views/helper.ts';
-import { VAULT_CHANGELOG_VIEW_CONFIG } from 'Views/VaultChangelog/VaultChangelog.ts';
-
-export function addContextMenuItems(plugin: GitChangelogPlugin): void {
-  plugin.registerEvent(
-    plugin.app.workspace.on('file-menu', (menu, file) => {
-      const gitRelativePath = plugin
-        .getGitPlugin()
-        .gitManager.getRelativeRepoPath(file.path, true);
-
-      addExcludeMenuItem({
-        menu,
-        isFolder: file instanceof TFolder,
-        gitRelativePath,
-        plugin
-      });
-    })
-  );
-
-  plugin.registerEvent(
-    plugin.app.workspace.on(
-      'git-changelog:menu',
-      (menu, inFileMenu, gitRelativePath, commitHash) => {
-        handleChangelogViewContextMenu({
-          menu,
-          inFileMenu,
-          gitRelativePath,
-          commitHash,
-          plugin
-        });
-      }
-    )
-  );
-}
-
-export function mayTriggerChangelogMenu({
-  event,
-  gitRelativePath,
-  commitHash,
-  view,
-  plugin
-}: {
-  event: MouseEvent;
-  gitRelativePath?: string;
-  commitHash?: string;
-  view: WorkspaceLeaf;
-  plugin: GitChangelogPlugin;
-}): void {
-  // eslint-disable-next-line eqeqeq
-  if (event.button == 2) {
-    const fileMenu = new Menu();
-    let showFileMenu = false;
-    // Check if it's a file right click.
-    if (gitRelativePath !== undefined) {
-      const vaultRelativePath = plugin
-        .getGitPlugin()
-        .gitManager.getRelativeVaultPath(gitRelativePath);
-      const tFile = plugin.app.vault.getAbstractFileByPath(vaultRelativePath);
-
-      // If the target file is a file that currently exists in the vault, open the usual file menu.
-      showFileMenu = fileOpenableInObsidian({
-        relativeVaultPath: tFile?.path,
-        plugin
-      });
-      if (showFileMenu) {
-        plugin.app.workspace.trigger(
-          'file-menu',
-          fileMenu,
-          assertNotNull(tFile),
-          view.view.getViewType(),
-          view
-        );
-      }
-    }
-
-    // Append the git-changelog menu items to the file menu.
-    plugin.app.workspace.trigger(
-      'git-changelog:menu',
-      fileMenu,
-      showFileMenu,
-      gitRelativePath,
-      commitHash
-    );
-    fileMenu.showAtPosition({ x: event.pageX, y: event.pageY });
-  }
-}
-
-/**
- * Check if the path is a relative path that goes above the root of the repository.
- *
- * If it starts with any number of /../, that means it's above the root.
- *
- * This is parsing the output of getRelativeRepoPath function.
- *
- * "../" is acceptable. (Non-absolute path)
- */
-function isAbsoluteGitIgnoreRuleAboveRoot({
-  absoluteGitIgnoreRule
-}: {
-  absoluteGitIgnoreRule: string;
-}): boolean {
-  return (
-    absoluteGitIgnoreRule.startsWith('/../') ||
-    // Case when path is the root folder itself
-    absoluteGitIgnoreRule.startsWith('//')
-  );
-}
-
-export function addExcludeMenuItem({
-  menu,
-  isFolder,
-  plugin,
-  gitRelativePath
-}: {
-  menu: Menu;
-  isFolder: boolean;
-  gitRelativePath: string;
-  plugin: GitChangelogPlugin;
-}): void {
-  const absoluteGitIgnoreRule = convertPathToAbsoluteGitIgnoreRule({
-    isFolder,
-    gitRelativePath
-  });
-  // Don't add the menu item if the path is above the root of the repository. Otherwise git would throw this error when trying to use this rule in pathspec:
-  // Fatal: :(exclude,glob)../xx/**: '../xx/**' is outside repository at '/path/to/vault/repo'
-  if (isAbsoluteGitIgnoreRuleAboveRoot({ absoluteGitIgnoreRule })) {
-    return;
-  }
-
-  menu.addItem((item) => {
-    // The ExcludeFilesAndFolders rules are applied relative to the git repo.
-
-    // Only check absolute rules, we don't want to modify any relative rules that also affect other files
-    const lineNumber = isAbsoluteGitIgnoreRuleInExcludeFilesAndFolders({
-      absoluteGitIgnoreRule,
-      plugin
-    });
-    const ruleAlreadyExists = lineNumber !== -1;
-    const isIncludeList = plugin.settings.convertToIncludeList;
-    let actionTitle: string;
-    if (isIncludeList) {
-      actionTitle = ruleAlreadyExists ? 'Re-exclude' : 'Include';
-    } else {
-      actionTitle = ruleAlreadyExists ? 'Reinclude' : 'Exclude';
-    }
-
-    item
-      .setSection('action')
-      .setTitle(`${PLUGIN_NAME_SENTENCE_CASE}: ${actionTitle}`)
-      .setIcon(VAULT_CHANGELOG_VIEW_CONFIG.icon)
-      .onClick(async () => {
-        await (ruleAlreadyExists
-          ? removeExcludeFilesAndFoldersItem(lineNumber, plugin)
-          : addExcludeFilesAndFoldersItem({
-              path: absoluteGitIgnoreRule,
-              plugin
-            }));
-      });
-  });
-}
-
-export function handleChangelogViewContextMenu({
-  menu,
-  inFileMenu,
-  gitRelativePath,
-  commitHash,
-  plugin
-}: {
-  menu: Menu;
-  inFileMenu: boolean;
-  gitRelativePath?: string;
-  commitHash?: string;
-  plugin: GitChangelogPlugin;
-}): void {
-  // Skip adding the "Git changelog: Exclude" item again if the usual file menu is shown.
-  if (!inFileMenu && gitRelativePath) {
-    addExcludeMenuItem({
-      menu,
-      isFolder: false,
-      gitRelativePath,
-      plugin
-    });
-  }
-
-  if (commitHash) {
-    let itemTitle = 'Copy commit hash';
-    let contentToCopy = commitHash;
-
-    // If used on a file tile inside changelog versions.
-    if (gitRelativePath) {
-      itemTitle += `:path`;
-      contentToCopy += `:${gitRelativePath}`;
-    }
-    menu.addItem((item) => {
-      item
-        .setTitle(itemTitle)
-        .setSection('action')
-        .setIcon(COPY_COMMIT_HASH_ICON)
-        .onClick(async () => {
-          await navigator.clipboard.writeText(contentToCopy);
-          plugin.displayNotice(
-            `Commit information ${contentToCopy} copied to clipboard.`,
-            // eslint-disable-next-line no-magic-numbers
-            1000
-          );
-        });
-    });
-  }
-}
-
-export function convertPathToAbsoluteGitIgnoreRule({
-  isFolder,
-  gitRelativePath
-}: {
-  isFolder: boolean;
-  gitRelativePath: string;
-}): string {
-  // Add a leading slash to set the rule as absolute from root, so it only excludes that exact path
-  let composedPath = '/';
-
-  composedPath += gitRelativePath;
-
-  // Add an explicit folder rule, so that the same path doesn't also apply for files with that same name
-  if (isFolder) {
-    composedPath += '/';
-  }
-
-  return convertPathToGitIgnoreRule(composedPath);
-}
-
-/**
- * Checks if a given absolute gitignore rule exists in the plugin's exclude files and folders settings
- * @param gitIgnoreAbsoluteRule - The absolute gitignore rule to check for
- * @param plugin - The GitChangelogPlugin instance
- * @returns The line number (index) where the rule was found, or -1 if not found
- */
-export function isAbsoluteGitIgnoreRuleInExcludeFilesAndFolders({
-  absoluteGitIgnoreRule,
-  plugin
-}: {
-  absoluteGitIgnoreRule: string;
-  plugin: GitChangelogPlugin;
-}): number {
-  const existingLines = plugin.settings.excludeFilesAndFoldersLines;
-
-  // Trim unescaped trailing white space from existing lines, since it gets trimmed by git anyways.
-  // By doing this we won't miss already existing lines that only differ in trailing white space.
-  const existingRules = existingLines.map((line) => parseGitIgnoreLine(line));
-  return existingRules.indexOf(absoluteGitIgnoreRule);
-}
-
-export async function removeExcludeFilesAndFoldersItem(
-  lineNumber: number,
-  plugin: GitChangelogPlugin
-): Promise<void> {
-  await plugin.settingsManager.editAndSave(
-    (settings: GitChangelogSettings): void => {
-      settings.excludeFilesAndFoldersLines.splice(lineNumber, 1);
-    }
-  );
-}
-
-export async function addExcludeFilesAndFoldersItem({
-  path,
-  plugin
-}: {
-  path: string;
-  plugin: GitChangelogPlugin;
-}): Promise<void> {
-  await plugin.settingsManager.editAndSave(
-    (settings: GitChangelogSettings): void => {
-      settings.excludeFilesAndFoldersLines.push(path);
-    }
-  );
-}

src/settings/components/setting.ts

@@ -1,25 +1,38 @@
 import type GitChangelogPlugin from 'main.ts';
+import type { TextComponent } from 'obsidian';
+import type {
+  ChangelogGenerationSettings,
+  IGitChangelogSettings
+} from 'settings/settings.ts';
 import type { GitChangelogSettingsTab } from 'settings/settingsTab.ts';
 
+import { moment } from 'obsidian';
+import { NumberComponent } from 'obsidian-dev-utils/obsidian/Components/NumberComponent';
+import { TimeComponent } from 'obsidian-dev-utils/obsidian/Components/TimeComponent';
 import { SettingEx } from 'obsidian-dev-utils/obsidian/SettingEx';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
-export abstract class SettingComponent {
+export abstract class GitChangelogSetting {
   protected containerEl: HTMLElement;
   protected disabled: boolean;
   protected plugin: GitChangelogPlugin;
-  protected settingTab: GitChangelogSettingsTab;
+  protected settingTab?: GitChangelogSettingsTab;
 
   public constructor({
+    containerEl,
     disabled = false,
-    plugin
+    plugin,
+    settingTab
   }: {
+    containerEl: HTMLElement;
     disabled?: boolean;
     plugin: GitChangelogPlugin;
+    settingTab?: GitChangelogSettingsTab;
   }) {
     this.plugin = plugin;
+    this.containerEl = containerEl;
     this.disabled = disabled;
-    this.settingTab = this.plugin.settingsTab;
-    this.containerEl = this.settingTab.containerEl;
+    this.settingTab = settingTab;
   }
 
   public abstract display(): void;
@@ -34,15 +47,46 @@ export abstract class SettingComponent {
   }
 
   /**
-   * Delays the update of the settings UI.
-   * Used when the user toggles one of the settings that control enabled states of other settings. Delaying the update
-   * allows most of the toggle animation to run, instead of abruptly jumping between enabled/disabled states.
+   * It delays the update of the associated ui state of the conditional setting enabled or disabled state, so that the toggle animation can end its animation smoother.
    */
-  protected refreshDisplayWithDelay(timeout = 80): void {
+  protected refreshDisplayDelayed(timeout = 80): void {
     if (this.settingTab) {
-      setTimeout(() => {
-        this.settingTab?.display();
-      }, timeout);
+      setTimeout(() => this.settingTab?.display(), timeout);
+    }
+  }
+
+  protected setValueIfNonDefaultSetting({
+    diffSettingsProperty,
+    settingsProperty,
+    text
+  }: {
+    diffSettingsProperty?: keyof ChangelogGenerationSettings;
+    settingsProperty: keyof IGitChangelogSettings;
+    text: NumberComponent | TextComponent | TimeComponent;
+  }): void {
+    const storedValue = diffSettingsProperty
+      ? (this.plugin.settings[settingsProperty] as ChangelogGenerationSettings)[
+          diffSettingsProperty
+        ]
+      : this.plugin.settings[settingsProperty];
+    const defaultValue = diffSettingsProperty
+      ? (DEFAULT_SETTINGS[settingsProperty] as ChangelogGenerationSettings)[
+          diffSettingsProperty
+        ]
+      : DEFAULT_SETTINGS[settingsProperty];
+
+    if (defaultValue !== storedValue) {
+      if (text instanceof NumberComponent) {
+        text.setValue(Number(storedValue));
+      } else if (text instanceof TimeComponent) {
+        text.setValue(moment.duration({ hours: Number(storedValue) }));
+      } else {
+        text.setValue(
+          typeof storedValue === 'object'
+            ? JSON.stringify(storedValue)
+            : String(storedValue)
+        );
+      }
     }
   }
 }

src/settings/components/suggest.ts

@@ -13,23 +13,23 @@ export class TimeZoneSuggest extends AbstractInputSuggest<string> {
 
   public getSuggestions(inputString: string): string[] {
     const lowerCaseInputString = inputString.toLowerCase();
-    const timeZones: string[] = [];
+    const timezones: string[] = [];
 
-    for (const timeZone of TIME_ZONES_LIST) {
-      if (timeZone.toLowerCase().contains(lowerCaseInputString)) {
-        timeZones.push(timeZone);
+    for (const timezone of TIME_ZONES_LIST) {
+      if (timezone.toLowerCase().contains(lowerCaseInputString)) {
+        timezones.push(timezone);
       }
     }
 
-    return timeZones;
+    return timezones;
   }
 
-  public renderSuggestion(timeZone: string, element: HTMLElement): void {
-    element.setText(timeZone);
+  public renderSuggestion(timezone: string, element: HTMLElement): void {
+    element.setText(timezone);
   }
 
-  public override selectSuggestion(timeZone: string): void {
-    this.inputEl.value = timeZone;
+  public override selectSuggestion(timezone: string): void {
+    this.inputEl.value = timezone;
     this.inputEl.trigger('input');
     this.close();
   }

src/settings/helper.ts

@@ -0,0 +1,37 @@
+import type GitChangelogPlugin from 'main.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
+
+import { deepEqual } from 'obsidian-dev-utils/Object';
+import {
+  systemTimeZoneUnchanged,
+  validateCustomTimeZone
+} from 'settings/ui/CustomTimeZone.ts';
+
+export function changelogGenerationSettingsChanged({
+  newChangelogSettings,
+  oldChangelogSettings,
+  plugin
+}: {
+  newChangelogSettings: ChangelogGenerationSettings;
+  oldChangelogSettings: ChangelogGenerationSettings;
+  plugin: GitChangelogPlugin;
+}): boolean {
+  if (!oldChangelogSettings) {
+    return true;
+  }
+
+  // IsAncestor run
+
+  if (
+    !validateCustomTimeZone(newChangelogSettings.timezone) &&
+    !systemTimeZoneUnchanged(plugin)
+  ) {
+    return true;
+  }
+
+  if (deepEqual(oldChangelogSettings, newChangelogSettings)) {
+    return false;
+  }
+
+  return true;
+}

src/settings/settings.ts

@@ -1,203 +1,148 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
-import type { Except, ReadonlyDeep } from 'type-fest';
-
+import { PluginSettingsBase } from 'obsidian-dev-utils/obsidian/Plugin/PluginSettingsBase';
 import spacetime from 'spacetime';
 import {
   ChangelogInterval,
   DiffAlgorithm,
   DiffMeasurementUnit,
   FileExplorerStats,
-  FileSummariesDisplayMode,
-  WhitespaceIgnoreMode
+  FilesSummariesDisplayMode
 } from 'types.ts';
 
 // Constants
-// Takes 0.3 ms
 export const TIME_ZONES_LIST = new Set(Object.keys(spacetime().timezones));
 export const MAX_SUPPORTED_INTERVAL = 99_999; // ~69 days
 export const AUTO_DETECT_PLACEHOLDER = 'Auto-detect';
 
-export class GitChangelogSettings {
-  // Plugin state
-  public autoCommitDisabledWarningDismissed = false;
-  public firstStartup = true;
-  public activeMinutesPassedSinceLastCheckpoint = 0;
+/**
+ * Each change in these settings triggers a recalculation of the changelogs statistics.
+ */
+export interface ChangelogGenerationSettings {
+  // Time settings
+  dayStartHour: number;
+  // Diff settings
+  detectMovedContent: boolean;
+  diffAlgorithm: DiffAlgorithm;
+  measurementUnit: DiffMeasurementUnit;
+  renameDetectionStrictness: number;
+  renameLimit: string;
+  timezone: string;
+  locale: string;
+}
+
+export interface VaultChangelogGenerationSettings {
+  gitDiffIgnore: string;
+  interval: ChangelogInterval;
+}
+
+export interface IGitChangelogSettings {
+  autoCommitDisabledWarningDismissed: boolean;
+  changelogGenerationSettings: ChangelogGenerationSettings;
+  contentDeletionsAndMovesWarningThreshold: string;
+  dedicatedFileTypeSummaries: string[];
+  fileChangelogInterval: ChangelogInterval;
+  fileExplorerInterval: string;
+  fileExplorerStats: FileExplorerStats;
+  filesChangesWarningThreshold: string;
+  fileSummariesDisplayMode: FilesSummariesDisplayMode;
+  firstStartup: boolean;
+  notifyOnContentDeletionsAndMovesThresholdReached: boolean;
+  notifyOnFilesChangesThresholdReached: boolean;
+  statusBarInterval: string;
+  statusBarStats: boolean;
+  vaultChangelogGenerationSettings: VaultChangelogGenerationSettings;
+}
+
+export class GitChangelogPluginSettings
+  extends PluginSettingsBase
+  implements IGitChangelogSettings
+{
+  // State
+  public autoCommitDisabledWarningDismissed: boolean =
+    DEFAULT_SETTINGS.autoCommitDisabledWarningDismissed;
+
+  public firstStartup: boolean = DEFAULT_SETTINGS.firstStartup;
+
+  public changelogGenerationSettings: ChangelogGenerationSettings =
+    DEFAULT_CHANGELOG_GENERATION_SETTINGS;
+
+  /**
+   * The number refers to either words or lines depending on what the changelog is set up to count
+   */
+  public contentDeletionsAndMovesWarningThreshold: string =
+    DEFAULT_SETTINGS.contentDeletionsAndMovesWarningThreshold;
 
   // ShowFilesSummaryCountOptions[]; //Set<ShowFilesSummaryCountOptions>;
   // VaultChangelogFilesVisibility: VaultChangelogFilesVisibility;
   // NotifyOnLargeCommitAdditions: boolean;
   // NotifyOnLargeCommitAdditionsWarningThreshold: string;
-  public dedicatedFileTypeSummaries: string[] = [];
-  public fileSummariesDisplayMode: FileSummariesDisplayMode =
-    FileSummariesDisplayMode.Total;
+  public dedicatedFileTypeSummaries: string[] = [
+    ...DEFAULT_SETTINGS.dedicatedFileTypeSummaries
+  ];
 
-  public fileExplorerInterval = '4320'; // In mins
-  public fileExplorerStats: FileExplorerStats = FileExplorerStats.Disabled;
+  public fileChangelogInterval: ChangelogInterval =
+    DEFAULT_SETTINGS.fileChangelogInterval;
 
-  public notifyOnHighContentDeletionsAndMoves = true;
-  /**
-   * The number refers to either words or lines depending on what the changelog is set up to count
-   */
-  public contentDeletionsAndMovesWarningThreshold = '2000';
+  public fileExplorerInterval: string = DEFAULT_SETTINGS.fileExplorerInterval;
+  public fileExplorerStats: FileExplorerStats =
+    DEFAULT_SETTINGS.fileExplorerStats;
 
-  public notifyOnHighFilesChanged = false;
-  public filesChangedWarningThreshold = '50';
+  public filesChangesWarningThreshold: string =
+    DEFAULT_SETTINGS.filesChangesWarningThreshold;
 
-  public checkpointCommits: string[] = [];
-  public reviewChangesReminderInterval = 0;
+  public fileSummariesDisplayMode: FilesSummariesDisplayMode =
+    DEFAULT_SETTINGS.fileSummariesDisplayMode;
 
-  public statusBarInterval = 30; // In mins
-  public showStatusBarStats = false;
+  public notifyOnContentDeletionsAndMovesThresholdReached: boolean =
+    DEFAULT_SETTINGS.notifyOnContentDeletionsAndMovesThresholdReached;
 
-  // FileGenerationSettings
-  public fileChangelogInterval: ChangelogInterval = ChangelogInterval.Daily;
+  public notifyOnFilesChangesThresholdReached: boolean =
+    DEFAULT_SETTINGS.notifyOnFilesChangesThresholdReached;
 
-  // VaultGenerationSettings
-  public excludeFilesAndFoldersLines: string[] = [];
-  public enableExclusionList = true;
-  public convertToIncludeList = false;
-  public vaultChangelogInterval = ChangelogInterval.Daily;
+  public statusBarInterval: string = DEFAULT_SETTINGS.statusBarInterval;
+  public statusBarStats: boolean = DEFAULT_SETTINGS.statusBarStats;
+  // Specific Changelog Generation Settings
+  public vaultChangelogGenerationSettings: VaultChangelogGenerationSettings =
+    DEFAULT_VAULT_CHANGELOG_GENERATION_SETTINGS;
 
-  /**
-   * Each change in these settings triggers a recalculation of all the changelogs statistics.
-   */
-  // Time settings
-  public dayStartHour = 0;
-  // Diff settings
-  public detectMovedContent = true;
-  public diffAlgorithm = DiffAlgorithm.Inherit;
-  public diffMeasurementUnit = DiffMeasurementUnit.Words;
-  public renameDetectionStrictness = 50;
-  public renameLimit = 1000;
-  public timeZone = AUTO_DETECT_PLACEHOLDER;
-  public locale = AUTO_DETECT_PLACEHOLDER;
-  public whitespaceIgnoreMode = WhitespaceIgnoreMode.None;
-  public ignoreBlankLines = false;
+  public constructor(data: unknown) {
+    super();
+    // Object.assign(this, DEFAULT_SETTINGS);
+    this.init(data);
+    this._shouldSaveAfterLoad = true;
+  }
 }
 
-// This is needed for checking if the specific generation settings have changed. And on each new added setting, the developer will have to explicitly include or exclude the added setting from all of these categories.
+export const DEFAULT_VAULT_CHANGELOG_GENERATION_SETTINGS: VaultChangelogGenerationSettings =
+  {
+    gitDiffIgnore: '',
+    interval: ChangelogInterval.Daily
+  } as const;
 
-export function pickVaultChangelogSettings(
-  settings: ReadonlyDeep<ExtractPluginSettingsWrapper<GitChangelogPluginTypes>>
-): ReadonlyDeep<VaultGenerationSettings> {
-  return {
-    excludeFilesAndFoldersLines:
-      settings.safeSettings.excludeFilesAndFoldersLines,
-    convertToIncludeList: settings.safeSettings.convertToIncludeList,
-    vaultChangelogInterval: settings.safeSettings.vaultChangelogInterval,
-    enableExclusionList: settings.safeSettings.enableExclusionList
-  };
-}
-
-export function pickFileChangelogSettings(
-  settings: ReadonlyDeep<ExtractPluginSettingsWrapper<GitChangelogPluginTypes>>
-): ReadonlyDeep<FileGenerationSettings> {
-  return {
-    fileChangelogInterval: settings.safeSettings.fileChangelogInterval
-  };
-}
-
-export function pickGeneralChangelogSettings(
-  settings: ReadonlyDeep<ExtractPluginSettingsWrapper<GitChangelogPluginTypes>>
-): ReadonlyDeep<GenerationSettings> {
-  return {
-    dayStartHour: settings.safeSettings.dayStartHour,
-    detectMovedContent: settings.safeSettings.detectMovedContent,
-    diffAlgorithm: settings.safeSettings.diffAlgorithm,
-    diffMeasurementUnit: settings.safeSettings.diffMeasurementUnit,
-    renameDetectionStrictness: settings.safeSettings.renameDetectionStrictness,
-    renameLimit: settings.safeSettings.renameLimit,
-    timeZone: settings.safeSettings.timeZone,
-    whitespaceIgnoreMode: settings.safeSettings.whitespaceIgnoreMode,
-    ignoreBlankLines: settings.safeSettings.ignoreBlankLines
-  };
-}
-
-type VaultGenerationSettings = Except<
-  GitChangelogSettings,
-  | 'activeMinutesPassedSinceLastCheckpoint'
-  | 'autoCommitDisabledWarningDismissed'
-  | 'checkpointCommits'
-  | 'contentDeletionsAndMovesWarningThreshold'
-  | 'dayStartHour'
-  | 'dedicatedFileTypeSummaries'
-  | 'detectMovedContent'
-  | 'diffAlgorithm'
-  | 'diffMeasurementUnit'
-  | 'fileChangelogInterval'
-  | 'fileExplorerInterval'
-  | 'fileExplorerStats'
-  | 'filesChangedWarningThreshold'
-  | 'fileSummariesDisplayMode'
-  | 'firstStartup'
-  | 'ignoreBlankLines'
-  | 'locale'
-  | 'notifyOnHighContentDeletionsAndMoves'
-  | 'notifyOnHighFilesChanged'
-  | 'renameDetectionStrictness'
-  | 'renameLimit'
-  | 'reviewChangesReminderInterval'
-  | 'showStatusBarStats'
-  | 'statusBarInterval'
-  | 'timeZone'
-  | 'whitespaceIgnoreMode'
->;
-
-type FileGenerationSettings = Except<
-  GitChangelogSettings,
-  | 'activeMinutesPassedSinceLastCheckpoint'
-  | 'autoCommitDisabledWarningDismissed'
-  | 'checkpointCommits'
-  | 'contentDeletionsAndMovesWarningThreshold'
-  | 'convertToIncludeList'
-  | 'dayStartHour'
-  | 'dedicatedFileTypeSummaries'
-  | 'detectMovedContent'
-  | 'diffAlgorithm'
-  | 'diffMeasurementUnit'
-  | 'enableExclusionList'
-  | 'excludeFilesAndFoldersLines'
-  | 'fileExplorerInterval'
-  | 'fileExplorerStats'
-  | 'filesChangedWarningThreshold'
-  | 'fileSummariesDisplayMode'
-  | 'firstStartup'
-  | 'ignoreBlankLines'
-  | 'locale'
-  | 'notifyOnHighContentDeletionsAndMoves'
-  | 'notifyOnHighFilesChanged'
-  | 'renameDetectionStrictness'
-  | 'renameLimit'
-  | 'reviewChangesReminderInterval'
-  | 'showStatusBarStats'
-  | 'statusBarInterval'
-  | 'timeZone'
-  | 'vaultChangelogInterval'
-  | 'whitespaceIgnoreMode'
->;
-
-type GenerationSettings = Except<
-  GitChangelogSettings,
-  | 'activeMinutesPassedSinceLastCheckpoint'
-  | 'autoCommitDisabledWarningDismissed'
-  | 'checkpointCommits'
-  | 'contentDeletionsAndMovesWarningThreshold'
-  | 'convertToIncludeList'
-  | 'dedicatedFileTypeSummaries'
-  | 'enableExclusionList'
-  | 'excludeFilesAndFoldersLines'
-  | 'fileChangelogInterval'
-  | 'fileExplorerInterval'
-  | 'fileExplorerStats'
-  | 'filesChangedWarningThreshold'
-  | 'fileSummariesDisplayMode'
-  | 'firstStartup'
-  | 'locale'
-  | 'notifyOnHighContentDeletionsAndMoves'
-  | 'notifyOnHighFilesChanged'
-  | 'reviewChangesReminderInterval'
-  | 'showStatusBarStats'
-  | 'statusBarInterval'
-  | 'vaultChangelogInterval'
->;
+export const DEFAULT_CHANGELOG_GENERATION_SETTINGS: ChangelogGenerationSettings =
+  {
+    dayStartHour: 0,
+    detectMovedContent: true,
+    diffAlgorithm: DiffAlgorithm.Inherit,
+    measurementUnit: DiffMeasurementUnit.Words,
+    renameDetectionStrictness: 50,
+    renameLimit: '1000',
+    timezone: AUTO_DETECT_PLACEHOLDER,
+    locale: AUTO_DETECT_PLACEHOLDER
+  } as const;
+export const DEFAULT_SETTINGS: IGitChangelogSettings = {
+  autoCommitDisabledWarningDismissed: false,
+  changelogGenerationSettings: DEFAULT_CHANGELOG_GENERATION_SETTINGS,
+  vaultChangelogGenerationSettings: DEFAULT_VAULT_CHANGELOG_GENERATION_SETTINGS,
+  contentDeletionsAndMovesWarningThreshold: '2000',
+  dedicatedFileTypeSummaries: [] as const,
+  fileChangelogInterval: ChangelogInterval.Daily,
+  fileExplorerInterval: '4320', // In mins
+  fileExplorerStats: FileExplorerStats.Disabled,
+  filesChangesWarningThreshold: '50',
+  fileSummariesDisplayMode: FilesSummariesDisplayMode.Total,
+  firstStartup: true,
+  notifyOnContentDeletionsAndMovesThresholdReached: true,
+  notifyOnFilesChangesThresholdReached: false,
+  statusBarInterval: '30', // In mins
+  statusBarStats: false
+} as const;

src/settings/settingsManager.ts

@@ -1,277 +0,0 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
-import type { MaybeReturn } from 'obsidian-dev-utils/Type';
-
-import {
-  MAX_RENAME_DETECTION_STRICTNESS,
-  MIN_RENAME_DETECTION_STRICTNESS
-} from 'constants.ts';
-import { Notice } from 'obsidian';
-import { PluginSettingsManagerBase } from 'obsidian-dev-utils/obsidian/Plugin/PluginSettingsManagerBase';
-import {
-  GitChangelogSettings,
-  MAX_SUPPORTED_INTERVAL
-} from 'settings/settings.ts';
-import { validateLocale } from 'settings/ui/CustomLocale.ts';
-import { validateCustomTimeZone } from 'settings/ui/CustomTimeZone.ts';
-import {
-  ChangelogInterval,
-  DiffAlgorithm,
-  DiffMeasurementUnit,
-  FileExplorerStats,
-  WhitespaceIgnoreMode
-} from 'types.ts';
-
-export class GitChangelogSettingsManager extends PluginSettingsManagerBase<GitChangelogPluginTypes> {
-  // eslint-disable-next-line @typescript-eslint/require-await
-  protected override async onLoadRecord(
-    record: Record<string, unknown>
-  ): Promise<void> {
-    // Only migrate if this is legacy data - check for the existence of the old settings structure
-    if ('vaultChangelogGenerationSettings' in record) {
-      // Check if the legacy excludeFilesAndFoldersLines data exists
-      const vaultSettings = record.vaultChangelogGenerationSettings as
-        | Record<string, unknown>
-        | undefined;
-      const legacyExcludeLines = vaultSettings?.excludeFilesAndFoldersLines;
-
-      // Check if we need to migrate (legacy data exists)
-      if (
-        legacyExcludeLines &&
-        Array.isArray(legacyExcludeLines) &&
-        legacyExcludeLines.length > 0 &&
-        (record.excludeFilesAndFoldersLines === undefined ||
-          record.excludeFilesAndFoldersLines === null ||
-          !Array.isArray(record.excludeFilesAndFoldersLines) ||
-          record.excludeFilesAndFoldersLines.length === 0)
-      ) {
-        // Migrate the data
-        record.excludeFilesAndFoldersLines = legacyExcludeLines;
-        // Remove the old settings structure to prevent future migrations
-        delete record.vaultChangelogGenerationSettings;
-
-        // We are assuming that the user is updating their plugin version, so we show the "what's changed" notification and alert the user that some of their settings broke.
-        const whatsNewFragment = createFragment((element) => {
-          element.createEl('p', {
-            text: 'Git changelog:\nA new version has been installed.\n\nSome of your settings for this plugin have been reset!'
-          });
-
-          element.createEl('button', { text: 'Close' });
-
-          const seeButton = element.createEl('button', { text: "What's new?" });
-          seeButton.onClickEvent(() => {
-            window.open(
-              'https://github.com/shumadrid/obsidian-git-changelog/releases'
-            );
-          });
-          seeButton.addClass('git-changelog-left-padding');
-        });
-        new Notice(whatsNewFragment, 0);
-      }
-    }
-  }
-
-  protected override createDefaultSettings(): GitChangelogSettings {
-    return new GitChangelogSettings();
-  }
-
-  protected override registerValidators(): void {
-    super.registerValidators();
-
-    // If the active minutes cache is corrupted then just reset it.
-    this.registerValidator(
-      'activeMinutesPassedSinceLastCheckpoint',
-      (activeMinutesPassedSinceLastCheckpoint): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(activeMinutesPassedSinceLastCheckpoint) ||
-          activeMinutesPassedSinceLastCheckpoint < 0
-        ) {
-          // Reset to 0 if corrupted
-          return 'Corrupted value detected. Resetting to 0.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'diffMeasurementUnit',
-      (measurementUnit): MaybeReturn<string> => {
-        if (!Object.values(DiffMeasurementUnit).includes(measurementUnit)) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'contentDeletionsAndMovesWarningThreshold',
-      (contentDeletionsAndMovesWarningThreshold): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(Number(contentDeletionsAndMovesWarningThreshold)) ||
-          Number(contentDeletionsAndMovesWarningThreshold) < 1
-        ) {
-          return 'Pick a positive whole number.';
-        }
-      }
-    );
-
-    this.registerValidator('locale', (locale): MaybeReturn<string> => {
-      if (!validateLocale(locale) && locale !== this.defaultSettings.locale) {
-        return 'Invalid locale code.';
-      }
-    });
-
-    this.registerValidator('timeZone', (timeZone): MaybeReturn<string> => {
-      if (
-        !validateCustomTimeZone(timeZone) &&
-        timeZone !== this.defaultSettings.timeZone
-      ) {
-        return 'Invalid timezone.';
-      }
-    });
-
-    const ONE_DAY_IN_HOURS = 24;
-
-    this.registerValidator(
-      'dayStartHour',
-      (dayStartHour): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(dayStartHour) ||
-          dayStartHour < 0 ||
-          dayStartHour >= ONE_DAY_IN_HOURS
-        ) {
-          return 'Invalid time.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'diffAlgorithm',
-      (diffAlgorithm): MaybeReturn<string> => {
-        if (!Object.values(DiffAlgorithm).includes(diffAlgorithm)) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'filesChangedWarningThreshold',
-      (filesChangedWarningThreshold): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(Number(filesChangedWarningThreshold)) ||
-          Number(filesChangedWarningThreshold) < 1
-        ) {
-          return 'Pick a positive whole number.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'fileExplorerStats',
-      (fileExplorerStats): MaybeReturn<string> => {
-        if (!Object.values(FileExplorerStats).includes(fileExplorerStats)) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'fileExplorerInterval',
-      (fileExplorerInterval): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(Number(fileExplorerInterval)) ||
-          Number(fileExplorerInterval) < 1 ||
-          Number(fileExplorerInterval) > MAX_SUPPORTED_INTERVAL
-        ) {
-          return `Pick a positive whole number not greater than ${MAX_SUPPORTED_INTERVAL}.`;
-        }
-      }
-    );
-
-    this.registerValidator(
-      'renameLimit',
-      (renameLimit): MaybeReturn<string> => {
-        if (
-          !(
-            Number.isInteger(renameLimit) &&
-            Number(renameLimit) >= 0 &&
-            // eslint-disable-next-line no-magic-numbers
-            Number(renameLimit) <= 99_999_999_999_999_999_999n
-          )
-        ) {
-          return 'Pick a non-negative whole number.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'reviewChangesReminderInterval',
-      (reviewChangesReminderInterval): MaybeReturn<string> => {
-        if (
-          !(
-            Number.isInteger(reviewChangesReminderInterval) &&
-            Number(reviewChangesReminderInterval) >= 0 &&
-            // eslint-disable-next-line no-magic-numbers
-            Number(reviewChangesReminderInterval) <= 999_999_999
-          )
-        ) {
-          return 'Pick a non-negative whole number.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'renameDetectionStrictness',
-      (renameDetectionStrictness): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(renameDetectionStrictness) ||
-          renameDetectionStrictness < MIN_RENAME_DETECTION_STRICTNESS ||
-          renameDetectionStrictness > MAX_RENAME_DETECTION_STRICTNESS
-        ) {
-          return `Pick a whole number between ${MIN_RENAME_DETECTION_STRICTNESS} and ${MAX_RENAME_DETECTION_STRICTNESS}.`;
-        }
-      }
-    );
-
-    this.registerValidator(
-      'statusBarInterval',
-      (statusBarInterval): MaybeReturn<string> => {
-        if (
-          !Number.isInteger(Number(statusBarInterval)) ||
-          Number(statusBarInterval) < 1 ||
-          Number(statusBarInterval) > MAX_SUPPORTED_INTERVAL
-        ) {
-          return `Pick a positive whole number not greater than ${MAX_SUPPORTED_INTERVAL}.`;
-        }
-      }
-    );
-
-    this.registerValidator(
-      'whitespaceIgnoreMode',
-      (whitespaceIgnoreMode): MaybeReturn<string> => {
-        if (
-          !Object.values(WhitespaceIgnoreMode).includes(whitespaceIgnoreMode)
-        ) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'fileChangelogInterval',
-      (fileChangelogInterval): MaybeReturn<string> => {
-        if (!Object.values(ChangelogInterval).includes(fileChangelogInterval)) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-
-    this.registerValidator(
-      'vaultChangelogInterval',
-      (vaultChangelogInterval): MaybeReturn<string> => {
-        if (
-          !Object.values(ChangelogInterval).includes(vaultChangelogInterval)
-        ) {
-          return 'Choose a valid option.';
-        }
-      }
-    );
-  }
-}

src/settings/settingsTab.ts

@@ -1,27 +1,23 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
+import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
 
 import { PluginSettingsTabBase } from 'obsidian-dev-utils/obsidian/Plugin/PluginSettingsTabBase';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 import { CustomLocale } from 'settings/ui/CustomLocale.ts';
-import { DayStartHour } from 'settings/ui/DayStartTime.ts';
-import { DiffAlgorithmOptions } from 'settings/ui/DiffAlgorithmOptions.ts';
-import { IgnoreBlankLinesToggle } from 'settings/ui/IgnoreBlankLinesToggle.ts';
-import { IncludeItemsToggle } from 'settings/ui/IncludeItemsToggle.ts';
 import { MiscellaneousButtons } from 'settings/ui/MiscellaneousButtons.ts';
-import { WhitespaceIgnoreModeOptions } from 'settings/ui/WhitespaceIgnoreMode.ts';
-import { WhitespaceSettingsHeading } from 'settings/ui/WhitespaceSettingsHeading.ts';
 
 import { AutoCommitDisabledWarning } from './ui/AutoCommitDisabledWarning.ts';
 import { CustomTimeZone } from './ui/CustomTimeZone.ts';
+import { DayStartTime } from './ui/DayStartTime.ts';
+import { DiffAlgorithmOptions } from './ui/DiffAlgorithmOptions.ts';
 import { ExcludeFilesAndFolders } from './ui/ExcludeFilesAndFolders.ts';
 import { GitPluginWarning } from './ui/GitPluginWarning.ts';
 import { RenameDetectionFileLimit } from './ui/RenameDetectionFileLimit.ts';
 import { RenameDetectionStrictnessSlider } from './ui/RenameDetectionStrictnessSlider.ts';
-import { ReviewChangesReminderInterval } from './ui/ReviewChangesReminderInterval.ts';
 import { StatusBarInterval } from './ui/StatusBarInterval.ts';
 import { StatusBarStatsToggle } from './ui/StatusBarStatsToggle.ts';
 
 // Commented-out settings are for features that will be implemented later
-export class GitChangelogSettingsTab extends PluginSettingsTabBase<GitChangelogPluginTypes> {
+export class GitChangelogSettingsTab extends PluginSettingsTabBase<GitChangelogPlugin> {
   public override display(): void {
     const { containerEl, plugin } = this;
 
@@ -30,62 +26,73 @@ export class GitChangelogSettingsTab extends PluginSettingsTabBase<GitChangelogP
     //   Plugin.settings.notifyIfContentDeletionsAndMovesThresholdReached ??
     //   DEFAULT_SETTINGS.notifyIfContentDeletionsAndMovesThresholdReached;
 
-    new GitPluginWarning({ plugin }).display();
+    new GitPluginWarning({ containerEl, plugin }).display();
 
-    new AutoCommitDisabledWarning({ plugin }).display();
+    new AutoCommitDisabledWarning({
+      containerEl,
+      plugin
+    }).display();
 
-    new DayStartHour({ plugin }).display();
+    new DayStartTime({ containerEl, plugin }).display();
 
-    new CustomTimeZone({ plugin }).display();
+    new CustomTimeZone({ containerEl, plugin }).display();
 
-    new CustomLocale({ plugin }).display();
+    new CustomLocale({ containerEl, plugin }).display();
 
-    new DiffAlgorithmOptions({ plugin }).display();
-
-    // New DeletionsNotificationThreshold(plugin,  false, this).display();
+    new DiffAlgorithmOptions({
+      containerEl,
+      plugin
+    }).display();
+    // New DeletionsNotificationThreshold(plugin, containerEl, false, this).display();
     // New configureDeletionsMovesAlert(
     //   Plugin,
-    //
+    //   ContainerEl,
     //   !notifyOnLargeChanges
     // ).display();
     // New FileChangesNotificationThreshold(
     //   Plugin,
-    //
+    //   ContainerEl,
     //   NotifyOnLargeChanges
     // ).display();
-    // New ChangelogStatsInFileExplorerOptions(plugin,  false, this).display();
+    // New ChangelogStatsInFileExplorerOptions(plugin, containerEl, false, this).display();
 
     // New FileExplorerStatsInterval(
     //   Plugin,
-    //
+    //   ContainerEl,
     //   (plugin.settings?.fileExplorerChangelogStats ??
     //     DEFAULT_SETTINGS.fileExplorerChangelogStats) ===
     //     FileExplorerChangelogStats.Disabled
     // ).display();
-    new ExcludeFilesAndFolders({ plugin }).display();
+    new ExcludeFilesAndFolders({ containerEl, plugin }).display();
 
-    new IncludeItemsToggle({ plugin }).display();
-
-    new RenameDetectionStrictnessSlider({ plugin }).display();
-
-    new RenameDetectionFileLimit({ plugin }).display();
-
-    new StatusBarStatsToggle({ plugin }).display();
-
-    new StatusBarInterval({
-      disabled: !plugin.settings.showStatusBarStats,
+    new RenameDetectionStrictnessSlider({
+      containerEl,
       plugin
     }).display();
 
-    new ReviewChangesReminderInterval({ plugin }).display();
+    new RenameDetectionFileLimit({
+      containerEl,
+      plugin
+    }).display();
 
-    new WhitespaceSettingsHeading({ plugin }).display();
+    new StatusBarStatsToggle({
+      containerEl,
+      plugin,
+      settingTab: this
+    }).display();
 
-    new WhitespaceIgnoreModeOptions({ plugin }).display();
+    new StatusBarInterval({
+      containerEl,
+      disabled: !(
+        plugin.settings.statusBarStats ?? DEFAULT_SETTINGS.statusBarStats
+      ),
+      plugin
+    }).display();
 
-    new IgnoreBlankLinesToggle({ plugin }).display();
-
-    new MiscellaneousButtons({ plugin }).display();
+    new MiscellaneousButtons({
+      containerEl,
+      plugin
+    }).display();
   }
   // New DetectMovedContentToggle(plugin, containerEl).display();
   // New ChangelogMeasurementUnit(plugin, containerEl).display();

src/settings/ui/AutoCommitDisabledWarning.ts

@@ -1,8 +1,6 @@
-import type { GitChangelogSettings } from 'settings/settings.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 
-import { SettingComponent } from 'settings/components/setting.ts';
-
-export class AutoCommitDisabledWarning extends SettingComponent {
+export class AutoCommitDisabledWarning extends GitChangelogSetting {
   public display(): void {
     try {
       const gitPlugin = this.plugin.getGitPlugin();
@@ -21,12 +19,10 @@ export class AutoCommitDisabledWarning extends SettingComponent {
             button.onClick(() => {
               warningSetting.settingEl.remove();
 
+              const newSettings = this.plugin.settingsClone;
+              newSettings.autoCommitDisabledWarningDismissed = true;
               // eslint-disable-next-line @typescript-eslint/no-floating-promises
-              this.plugin.settingsManager.editAndSave(
-                (settings: GitChangelogSettings): void => {
-                  settings.autoCommitDisabledWarningDismissed = true;
-                }
-              );
+              this.plugin.saveSettings(newSettings);
             });
           });
       }

src/settings/ui/ChangelogMeasurementUnit.ts

@@ -1,14 +1,51 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
+
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 import { DiffMeasurementUnit } from 'types.ts';
 
-export class ChangelogMeasurementUnit extends SettingComponent {
+export class ChangelogMeasurementUnit extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Changelog measurement unit')
-      .addTypedDropdown((dropdown) => {
-        dropdown.addOption(DiffMeasurementUnit.Lines, 'Lines');
-        dropdown.addOption(DiffMeasurementUnit.Words, 'Words');
-        this.settingTab.bind(dropdown, 'diffMeasurementUnit');
+      .addDropdown((dropdown) => {
+        const options: Record<DiffMeasurementUnit, string> = {
+          Lines: 'Lines',
+          Words: 'Words'
+        };
+        dropdown.addOptions(options);
+        dropdown.setValue(
+          getMeasurementUnit(this.plugin.settings.changelogGenerationSettings)
+        );
+
+        dropdown.onChange((value: string) => {
+          const option =
+            DiffMeasurementUnit[value as keyof typeof DiffMeasurementUnit];
+
+          const newSettings = this.plugin.settingsClone;
+          newSettings.changelogGenerationSettings.measurementUnit = option;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
+        });
       });
   }
 }
+export function getMeasurementUnit(
+  changelogGenerationSettings: ChangelogGenerationSettings
+): DiffMeasurementUnit {
+  return DiffMeasurementUnit.Lines;
+  if (!validateMeasurementUnit(changelogGenerationSettings.measurementUnit)) {
+    return DEFAULT_SETTINGS.changelogGenerationSettings.measurementUnit;
+  }
+
+  return changelogGenerationSettings.measurementUnit;
+}
+
+export function validateMeasurementUnit(
+  measurementUnit: DiffMeasurementUnit
+): boolean {
+  if (Object.values(DiffMeasurementUnit).includes(measurementUnit)) {
+    return true;
+  }
+  return false;
+}

src/settings/ui/ChangelogStatsInFileExplorerOptions.ts

@@ -1,23 +1,32 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 import { FileExplorerStats } from 'types.ts';
 
-export class ChangelogStatsInFileExplorerOptions extends SettingComponent {
+export class ChangelogStatsInFileExplorerOptions extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Show changelog stats in file explorer')
-      .addTypedDropdown((dropdown) => {
-        dropdown.addOption(FileExplorerStats.Disabled, 'Disabled');
-        dropdown.addOption(FileExplorerStats.Folders, 'Folders');
-        dropdown.addOption(
-          FileExplorerStats.FoldersAndNotes,
-          'Folders and notes'
+      .addDropdown((dropdown) => {
+        const options: Record<FileExplorerStats, string> = {
+          Disabled: 'Disabled',
+          Folders: 'Folders',
+          FoldersAndNotes: 'Notes'
+        };
+        dropdown.addOptions(options);
+        dropdown.setValue(
+          this.plugin.settings.fileExplorerStats ??
+            DEFAULT_SETTINGS.fileExplorerStats
         );
+        dropdown.onChange((value: string) => {
+          const option =
+            FileExplorerStats[value as keyof typeof FileExplorerStats];
 
-        this.settingTab.bind(dropdown, 'fileExplorerStats', {
-          onChanged: () => {
-            // eslint-disable-next-line no-magic-numbers
-            this.refreshDisplayWithDelay(30);
-          }
+          this.refreshDisplayDelayed(0);
+
+          const newSettings = this.plugin.settingsClone;
+          newSettings.fileExplorerStats = option;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
         });
       });
   }

src/settings/ui/ContentDeletionsMovesThreshold.ts

@@ -1,6 +1,7 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
-export class ContentDeletionsMovesThreshold extends SettingComponent {
+export class ContentDeletionsMovesThreshold extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Custom threshold for deletions/moves alert')
@@ -8,10 +9,33 @@ export class ContentDeletionsMovesThreshold extends SettingComponent {
         "Acceptable amount of deletions and moves between commits. Represents either words or lines, depending on your setup. Note that this doesn't mean between each interval but between the actual commits, meaning if your auto-commit interval is five minutes, this will trigger only if you manage to delete that many files inside those five minutes, which usually signals corruption or data loss."
       )
       .addText((text) => {
-        text.setDisabled(this.disabled);
+        text.setDisabled(this.disabled).onChange((value) => {
+          const newSettings = this.plugin.settingsClone;
+          newSettings.contentDeletionsAndMovesWarningThreshold =
+            validateContentDeletionsMovesThreshold(value)
+              ? value
+              : DEFAULT_SETTINGS.contentDeletionsAndMovesWarningThreshold;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
+        });
         // This.restrictToPositiveIntegerInput(text);
 
-        this.settingTab.bind(text, 'contentDeletionsAndMovesWarningThreshold');
+        this.setValueIfNonDefaultSetting({
+          settingsProperty: 'contentDeletionsAndMovesWarningThreshold',
+          text
+        });
       });
   }
 }
+
+export function validateContentDeletionsMovesThreshold(
+  contentDeletionsMovesThreshold: string
+): boolean {
+  if (
+    !Number.isInteger(Number(contentDeletionsMovesThreshold)) ||
+    Number(contentDeletionsMovesThreshold) < 1
+  ) {
+    return false;
+  }
+  return true;
+}

src/settings/ui/CustomLocale.ts

@@ -1,63 +1,50 @@
 import type GitChangelogPlugin from 'main.ts';
 
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
-export class CustomLocale extends SettingComponent {
+export class CustomLocale extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Date format locale')
       .setDesc(`Accepts a locale code (e.g. "en-US").`)
       .addText((text) => {
         text.inputEl.maxLength = 30;
+        text
+          .setPlaceholder(DEFAULT_SETTINGS.changelogGenerationSettings.locale)
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.changelogGenerationSettings.locale = value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
 
-        this.settingTab.bind(text, 'locale', {
-          onChanged: () => {
-            // Without this check, plugin fails on startup
-            if (this.plugin.settingsManager) {
-              this.plugin.localeSafe = getLocaleToAssign(this.plugin);
-            }
-          }
+        this.setValueIfNonDefaultSetting({
+          settingsProperty: 'changelogGenerationSettings',
+          diffSettingsProperty: 'locale',
+          text
         });
       });
   }
 }
 
-function getSystemLocale(plugin: GitChangelogPlugin): string {
-  if (plugin.detectedLocale === undefined) {
-    // Detect the system locale using Intl API and save it for the current Obsidian session.
-    const systemLocale = Intl.DateTimeFormat().resolvedOptions().locale;
-
-    if (validateLocale(systemLocale)) {
-      plugin.detectedLocale = systemLocale;
-    } else {
-      plugin.displayNotice(
-        "Couldn't detect a valid system locale: Obsidian installer version might be too old.\nFallback to en-US."
-      );
-      plugin.detectedLocale = 'en-US';
-    }
+export function getUserLocale(plugin: GitChangelogPlugin): string {
+  const locale = plugin.settings.changelogGenerationSettings.locale;
+  if (validateLocale(locale)) {
+    return locale;
   }
-
-  return plugin.detectedLocale;
+  // Decided against using the new Obsidian language API so that the plugin is compatible with older versions of Obsidian (for now, will update later).
+  return Intl.DateTimeFormat().resolvedOptions().locale;
 }
 
-export function getLocaleToAssign(plugin: GitChangelogPlugin): string {
-  return plugin.settings.locale ===
-    plugin.settingsManager.defaultSettings.locale
-    ? getSystemLocale(plugin)
-    : plugin.settings.locale;
-}
-
-export function validateLocale(locale: string): boolean {
+export function validateLocale(locale?: string): boolean {
   try {
     if (!locale || typeof locale !== 'string') {
       return false;
     }
     new Intl.Locale(locale);
-    if (Intl.DateTimeFormat.supportedLocalesOf([locale]).length === 0) {
-      return false;
-    }
+    return Intl.DateTimeFormat.supportedLocalesOf([locale]).length > 0;
   } catch {
     return false;
   }
-  return true;
 }

src/settings/ui/CustomTimeZone.ts

@@ -1,48 +1,77 @@
 import type GitChangelogPlugin from 'main.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 
-import { SettingComponent } from 'settings/components/setting.ts';
+import { Notice } from 'obsidian';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 import { TimeZoneSuggest } from 'settings/components/suggest.ts';
-import { TIME_ZONES_LIST } from 'settings/settings.ts';
+import { DEFAULT_SETTINGS, TIME_ZONES_LIST } from 'settings/settings.ts';
 
-export class CustomTimeZone extends SettingComponent {
+export class CustomTimeZone extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Timezone')
       .addText((text) => {
-        this.settingTab.bind(text, 'timeZone');
+        text
+          .setPlaceholder(DEFAULT_SETTINGS.changelogGenerationSettings.timezone)
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.changelogGenerationSettings.timezone = value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
+
+        this.setValueIfNonDefaultSetting({
+          diffSettingsProperty: 'timezone',
+          settingsProperty: 'changelogGenerationSettings',
+          text
+        });
 
         new TimeZoneSuggest(this.plugin.app, text.inputEl);
       });
   }
 }
 
-function getSystemTimeZone(plugin: GitChangelogPlugin): string {
-  if (plugin.detectedTimeZone === undefined) {
-    // Detect the system time zone using Intl API and save it for the current Obsidian session.
-    const systemTimeZone = Intl.DateTimeFormat()
-      .resolvedOptions()
-      .timeZone.toLowerCase();
+export function detectSystemTimeZone(): string {
+  return Intl.DateTimeFormat().resolvedOptions().timeZone.toLowerCase();
+}
 
-    if (validateCustomTimeZone(systemTimeZone)) {
-      plugin.detectedTimeZone = systemTimeZone;
-    } else {
-      plugin.displayNotice(
-        "Couldn't detect a valid system time zone: Obsidian installer version might be too old.\nFallback to UTC."
-      );
-      plugin.detectedTimeZone = 'utc';
-    }
+export function getSystemTimeZone(plugin: GitChangelogPlugin): string {
+  if (plugin.detectedTimeZone !== undefined) {
+    return plugin.detectedTimeZone;
   }
 
+  const systemTimeZone = detectSystemTimeZone();
+  if (validateCustomTimeZone(systemTimeZone)) {
+    plugin.detectedTimeZone = systemTimeZone;
+  } else {
+    new Notice(
+      "Couldn't detect a valid system time zone: Obsidian installer version might be too old.\nFallback to UTC."
+    );
+    plugin.detectedTimeZone = 'utc';
+    return 'utc';
+  }
   return plugin.detectedTimeZone;
 }
 
-export function getTimeZone(plugin: GitChangelogPlugin): string {
-  return plugin.settings.timeZone ===
-    plugin.settingsManager.defaultSettings.timeZone
-    ? getSystemTimeZone(plugin)
-    : plugin.settings.timeZone;
+export function getTimeZone(
+  changelogGenerationSettings: ChangelogGenerationSettings,
+  plugin: GitChangelogPlugin
+): string {
+  return validateCustomTimeZone(changelogGenerationSettings.timezone)
+    ? changelogGenerationSettings.timezone
+    : getSystemTimeZone(plugin);
 }
 
-export function validateCustomTimeZone(timeZone: string): boolean {
-  return TIME_ZONES_LIST.has(timeZone.toLowerCase());
+export function systemTimeZoneUnchanged(plugin: GitChangelogPlugin): boolean {
+  const systemTimeZone = detectSystemTimeZone();
+  const cachedSystemTimeZone = plugin.detectedTimeZone;
+  if (systemTimeZone !== cachedSystemTimeZone) {
+    plugin.detectedTimeZone = systemTimeZone;
+    return false;
+  }
+  return true;
+}
+
+export function validateCustomTimeZone(timezone: string): boolean {
+  return TIME_ZONES_LIST.has(timezone.toLowerCase());
 }

src/settings/ui/DayStartTime.ts

@@ -1,32 +1,60 @@
-import { moment } from 'obsidian';
-import { SettingComponent } from 'settings/components/setting.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 
-export class DayStartHour extends SettingComponent {
+import { moment } from 'obsidian';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
+
+export class DayStartTime extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Day start time')
-      .setDesc(
-        'Adjust the day based on your schedule. Applies exclusively to the day interval in the changelog views.'
-      )
+      .setDesc('Adjust the day based on your schedule.')
       .addTime((text) => {
-        this.settingTab.bind(text, 'dayStartHour', {
-          componentToPluginSettingsValueConverter: (
-            uiValue: moment.Duration
-          ) => {
+        text
+          .setValue(
+            moment.duration({
+              hours:
+                this.plugin.settings.changelogGenerationSettings.dayStartHour
+            })
+          )
+          .onChange((value) => {
             // Clip any minutes. The smallest possible interval is an hour and this value should be clipped to that.
-            // Allowing the day start time to be specified in minutes doesn't make sense because then e.g. you would need to handle the half an hour that belongs to the previous day and the other half an hour that belongs to the next day separately.
-            return uiValue.hours();
-          },
-          onChanged: (value) => {
-            text.setValue(moment.duration(value, 'hours'));
-          },
-          shouldShowValidationMessage: false,
-          pluginSettingsToComponentValueConverter: (
-            pluginSettingsValue: number
-          ) => moment.duration(pluginSettingsValue, 'hours')
-        });
-        // eslint-disable-next-line no-magic-numbers
-        text.setStep(3600);
+            // Allowing the day start time to be specified in minutes doesn't make sense because then you would need to handle the half an hour that belongs to the previous day and the other half an hour that belongs to the next day separately.
+            text.setValue(
+              moment.duration({
+                hours: value.hours()
+              })
+            );
+
+            const newSettings = this.plugin.settingsClone;
+            newSettings.changelogGenerationSettings.dayStartHour =
+              value.hours();
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
+
+        text.inputEl.step = '3600';
       });
   }
 }
+
+export function getDayStartTime(
+  changelogGenerationSettings: ChangelogGenerationSettings
+): number {
+  return validateDayStartTime(changelogGenerationSettings.dayStartHour)
+    ? changelogGenerationSettings.dayStartHour
+    : DEFAULT_SETTINGS.changelogGenerationSettings.dayStartHour;
+}
+
+export const ONE_DAY_IN_HOURS = 24;
+
+export function validateDayStartTime(dayStartTime: number): boolean {
+  if (
+    !Number.isInteger(dayStartTime) ||
+    dayStartTime < 0 ||
+    dayStartTime >= ONE_DAY_IN_HOURS
+  ) {
+    return false;
+  }
+  return true;
+}

src/settings/ui/DeletionsNotificationThreshold.ts

@@ -1,18 +1,27 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 
-export class DeletionsNotificationThreshold extends SettingComponent {
+export class DeletionsNotificationThreshold extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Notify on large amount of changes.')
       .setDesc(
         'Notify if changes between neighboring commits exceed a threshold, which can be a sign of data loss or corruption.'
       )
-      .addToggle((toggle) => {
-        this.settingTab.bind(toggle, 'notifyOnHighContentDeletionsAndMoves', {
-          onChanged: () => {
-            this.refreshDisplayWithDelay();
-          }
-        });
-      });
+      .addToggle((toggle) =>
+        toggle
+          .setValue(
+            this.plugin.settings
+              .notifyOnContentDeletionsAndMovesThresholdReached
+          )
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.notifyOnContentDeletionsAndMovesThresholdReached =
+              value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+
+            this.refreshDisplayDelayed();
+          })
+      );
   }
 }

src/settings/ui/DetectMovedContentToggle.ts

@@ -1,6 +1,6 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 
-export class DetectMovedContentToggle extends SettingComponent {
+export class DetectMovedContentToggle extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Detect moved lines/words')
@@ -8,7 +8,16 @@ export class DetectMovedContentToggle extends SettingComponent {
         `If enabled, changelog will also track all moved words or lines between files or moved to another location in the same file. Adds significant computational overhead that increases with the number and size of changes.`
       )
       .addToggle((toggle) =>
-        this.settingTab.bind(toggle, 'detectMovedContent')
+        toggle
+          .setValue(
+            this.plugin.settings.changelogGenerationSettings.detectMovedContent
+          )
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.changelogGenerationSettings.detectMovedContent = value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          })
       );
   }
 }

src/settings/ui/DiffAlgorithmOptions.ts

@@ -1,64 +1,50 @@
-import type GitChangelogPlugin from 'main.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 
-import { appendCodeBlock } from 'obsidian-dev-utils/HTMLElement';
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 import { DiffAlgorithm } from 'types.ts';
 
-const GIT_CONFIG_PATH = '.git/config';
-
-export class DiffAlgorithmOptions extends SettingComponent {
+export class DiffAlgorithmOptions extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Difference detection algorithm')
       .setDesc(
-        createFragment((fragment) => {
-          fragment.appendText(
-            `For consistency with the unified Diff view and other git operations, it's recommended to also `
-          );
-          appendCodeBlock(fragment, 'Apply');
-          fragment.appendText(` the custom algorithm to `);
-          appendCodeBlock(fragment, GIT_CONFIG_PATH);
-          fragment.appendText(`.`);
-        })
+        "It's recommended to set a custom diff algorithm in git config instead of here, for consistency with the Diff viewer and other plugins."
       )
-      .addButton((button) => {
-        button.setButtonText('Apply');
-        button.setDisabled(shouldDisableApplyButton(this.plugin));
-        button.onClick(async () => {
-          const diffAlgorithm = this.plugin.settings.diffAlgorithm;
-          if (diffAlgorithm !== DiffAlgorithm.Inherit) {
-            try {
-              const git = await this.plugin.getGit();
-              await git.addConfig('diff.algorithm', diffAlgorithm);
-              this.plugin.displayNotice(
-                `Successfully applied "${diffAlgorithm}" diff algorithm to ${GIT_CONFIG_PATH}.`
-              );
-            } catch (error) {
-              this.plugin.displayError(
-                `Failed to apply diff algorithm to git config. ${error}`
-              );
-            }
-          }
-        });
-      })
-      .addTypedDropdown((dropdown) => {
-        dropdown.addOption(DiffAlgorithm.Inherit, 'Inherit git config');
-        dropdown.addOption(DiffAlgorithm.Default, 'Default (Faster)');
-        dropdown.addOption(DiffAlgorithm.Minimal, 'Minimal (More precise)');
-        this.settingTab.bind(dropdown, 'diffAlgorithm', {
-          onChanged: () => {
-            // eslint-disable-next-line no-magic-numbers
-            this.refreshDisplayWithDelay(30);
-          }
+      .addDropdown((dropdown) => {
+        const options: Record<DiffAlgorithm, string> = {
+          Default: 'Default (faster)', // Myers
+          Inherit: 'Use git config',
+          Minimal: 'Minimal (more precise)'
+        };
+        dropdown.addOptions(options);
+
+        dropdown.setValue(
+          getDiffAlgorithm(this.plugin.settings.changelogGenerationSettings)
+        );
+
+        dropdown.onChange((value: string) => {
+          const option = DiffAlgorithm[value as keyof typeof DiffAlgorithm];
+
+          const newSettings = this.plugin.settingsClone;
+          newSettings.changelogGenerationSettings.diffAlgorithm = option;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
         });
       });
   }
 }
 
-function shouldDisableApplyButton(plugin: GitChangelogPlugin): boolean {
-  const diffAlgorithm = plugin.settings.diffAlgorithm;
-  if (diffAlgorithm === DiffAlgorithm.Inherit) {
-    return true;
+export function getDiffAlgorithm(
+  changelogGenerationSettings: ChangelogGenerationSettings
+): DiffAlgorithm {
+  if (
+    !Object.values(DiffAlgorithm).includes(
+      changelogGenerationSettings.diffAlgorithm
+    )
+  ) {
+    return DEFAULT_SETTINGS.changelogGenerationSettings.diffAlgorithm;
   }
-  return false;
+
+  return changelogGenerationSettings.diffAlgorithm;
 }

src/settings/ui/ExcludeFilesAndFolders.ts

@@ -1,161 +1,175 @@
 // Import { compile } from "@gerhobbelt/gitignore-parser";
 
-import type { ReadonlyDeep } from 'type-fest';
+import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
 
-import { EXCLUDE_FILES_AND_FOLDERS } from 'constants.ts';
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
-export class ExcludeFilesAndFolders extends SettingComponent {
+export class ExcludeFilesAndFolders extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
-      .setName(
-        createFragment((fragment) => {
-          fragment.appendText(EXCLUDE_FILES_AND_FOLDERS);
-          fragment
-            .createEl('span', {
-              cls: 'nav-file-tag git-changelog-experimental'
-            })
-            .setText('EXPERIMENTAL');
-        })
-      )
+      .setName('Exclude files and folders (experimental)')
       .setDesc(
         createFragment((fragment) => {
           fragment.appendText(
-            "Items listed here will still be committed to your repository but won't be included in the vault changelog."
+            "Items listed here will still be committed to your repository but won't be included in the vault changelog. Use the same "
           );
-          fragment.createEl('br');
-          fragment.appendText('Use the same ');
           fragment.createEl('a', {
             href: 'https://gitcheatsheet.org/how-to/git-gitignore',
             text: 'syntax'
           });
           fragment.appendText(
-            ' as .gitignore, but note that negation patterns are not yet supported.'
+            " as .gitignore, but note that negation patterns are not yet supported. The main .gitignore file still applies. Don't forget to put .md for markdown files."
           );
-          fragment.createEl('br');
-          fragment.appendText('The main .gitignore file still applies.');
-          fragment.createEl('br');
-          fragment.appendText("Don't forget to put .md for markdown files.");
         })
       )
-      .addToggle((toggle) => {
-        this.settingTab.bind(toggle, 'enableExclusionList', {
-          onChanged: () => {
-            this.refreshDisplayWithDelay();
-          }
-        });
-        toggle.setTooltip(
-          `List is ${toggle.getValue() ? 'enabled' : 'temporarily disabled'}`
-        );
-      })
       .addTextArea((text) => {
-        text.setDisabled(!this.plugin.settings.enableExclusionList);
-        if (!this.plugin.settings.enableExclusionList) {
-          text.inputEl.addClass('git-changelog-disabled');
-        }
-
-        this.settingTab.bind(text, 'excludeFilesAndFoldersLines', {
-          componentToPluginSettingsValueConverter: (uiValue) =>
-            splitExcludeItems(uiValue),
-
-          pluginSettingsToComponentValueConverter: (pluginSettingsValue) =>
-            joinExcludeItems(pluginSettingsValue)
-        });
-
+        text
+          .setValue(
+            this.plugin.settings.vaultChangelogGenerationSettings
+              .gitDiffIgnore ??
+              DEFAULT_SETTINGS.vaultChangelogGenerationSettings.gitDiffIgnore
+          )
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.vaultChangelogGenerationSettings.gitDiffIgnore = value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
         text.inputEl.classList.add('git-changelog-text-area');
       });
   }
 }
 
-export function convertPathToGitIgnoreRule(path: string): string {
-  // First escape special characters (except whitespace), so that git doesn't interpret them as such.
-  const escaped = path.replaceAll(/(?<temp1>[\\!#*?[\]])/g, String.raw`\$1`);
+/**
+ * Doesn't work properly, using same gitignore for all submodules for now
+ */
+export function adjustGitignoreForSubmodule(
+  gitignoreContent: string,
+  submodulePath: string
+): string {
+  // Ensure submodulePath ends with a slash for matching purposes.
+  if (!submodulePath.endsWith('/')) {
+    submodulePath += '/';
+  }
 
-  // Then escape the last trailing whitespace character, because git trims unescaped trailing whitespace from the end of the line.
-  // Files normally end with a file extension, not whitespace, but a file with trailing whitespace can appear if Obsidian's "Detect all file extensions" setting is turned on.
-  return escaped.replaceAll(/\s(?=\s*$)/g, String.raw`\ `);
-}
+  // Regex for detecting glob characters.
+  const globRegex = /[*?[\]]/;
 
-export function joinExcludeItems(items: readonly string[]): string {
-  return items.join('\n');
-}
+  const lines = gitignoreContent.split('\n');
+  const adjustedLines: string[] = [];
 
-export function splitExcludeItems(items: string): string[] {
-  return items.split('\n');
-}
+  for (const line of lines) {
+    const trimmed = line.trim();
 
-// Trim trailing spaces that aren't preceded by a backslash before you apply gitignore to pathspec transformations.
-export function parseGitIgnoreLine(gitIgnoreLine: string): string {
-  // This regex will match trailing spaces that are not preceded by a backslash and stop trimming when a backslash is encountered
-  return gitIgnoreLine
-    .replace(/(?<!\\)\s+$/, '')
-    .replace(/\\\s*$/, String.raw`\ `);
+    // Keep blank lines and comments unchanged.
+    if (trimmed === '' || trimmed.startsWith('#')) {
+      adjustedLines.push(line);
+      continue;
+    }
+
+    let isNegation = false;
+    let rule = trimmed;
+
+    // Handle negation: remove the leading "!" for processing.
+    if (rule.startsWith('!')) {
+      isNegation = true;
+      rule = rule.slice(1).trim();
+    }
+
+    // If the rule explicitly starts with the submodule path,
+    // Remove that prefix so it is relative to the submodule.
+    if (rule.startsWith(submodulePath)) {
+      const adjustedRule = rule.slice(submodulePath.length);
+      adjustedLines.push(isNegation ? `!${adjustedRule}` : adjustedRule);
+    } else if (globRegex.test(rule)) {
+      // If the rule doesn't start with the submodule path...
+      // - If it is hardcoded (no glob characters), drop it.
+      // - If it contains globs, leave it intact.
+      adjustedLines.push(line); // Leave the original rule unchanged.
+      // Else: hardcoded rule outside the submodule is omitted.
+    }
+  }
+
+  // Remove any empty lines which might have resulted from omitting rules.
+  return adjustedLines.filter((l) => l.trim() !== '').join('\n');
 }
 
 export function convertGitIgnoreToPathspec(
-  gitIgnoreRules: ReadonlyDeep<string[]>,
-  include: boolean
+  plugin: GitChangelogPlugin
 ): string[] {
+  const gitDiffIgnore =
+    plugin.settings.vaultChangelogGenerationSettings.gitDiffIgnore;
   try {
-    const items: string[] = [];
+    // Always exclude .git directory
+    const excludes: string[] = [':(exclude,glob)**/.git/**'];
+    const includes: string[] = [];
 
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-boolean-literal-compare
-    const excludePrefix = include === true ? '' : 'exclude,';
-
-    for (const line of gitIgnoreRules.map((element) =>
-      parseGitIgnoreLine(element)
-    )) {
-      if (!isValidGitIgnoreRule(line) || line.startsWith('!')) {
+    for (const line of gitDiffIgnore
+      .split('\n')
+      .map((diffLine) => diffLine.trim())) {
+      if (!(isValidGitIgnoreRule(line) && !line.startsWith('!'))) {
         continue;
       }
 
-      const formatted = convertGitIgnoreRuleToPathspec(line);
+      const formatted = formatGitIgnoreToPathspec(line);
 
       // Handle patterns differently based on their format:
       if (line.endsWith('/*')) {
         // Single-level match
-        items.push(`:(${excludePrefix}glob)${formatted}`);
+        excludes.push(`:(exclude,glob)${formatted}`);
       } else if (line.endsWith('/**') || line.endsWith('/')) {
         // Recursive match
-        items.push(`:(${excludePrefix}glob)${formatted}`);
+        excludes.push(`:(exclude,glob)${formatted}`);
       } else {
         // All other patterns - match both item and contents
         // Regardless of whether they contain special characters
-        items.push(
-          `:(${excludePrefix}glob)${formatted}`,
-          `:(${excludePrefix}glob)${formatted}/**`
+        excludes.push(
+          `:(exclude,glob)${formatted}`,
+          `:(exclude,glob)${formatted}/**`
         );
       }
     }
-    return items;
-  } catch {
+
+    return [...excludes, ...includes];
+  } catch (error) {
+    plugin.consoleDebug(`Error converting gitignore to pathspec: ${error}`);
     return [];
   }
 }
 
-export function isValidGitIgnoreRule(parsedGitIgnoreLine: string): boolean {
-  // Empty lines are not valid rules
-  if (!parsedGitIgnoreLine || parsedGitIgnoreLine.trim().length === 0) {
+export function isValidGitIgnoreRule(rule: string): boolean {
+  if (!rule || rule.trim().length === 0) {
+    return false;
+  }
+  if (rule.startsWith('#')) {
     return false;
   }
 
-  // Comments are not valid rules
-  if (parsedGitIgnoreLine.startsWith('#')) {
+  // Strip leading negation if present
+  const patternToCheck = rule.startsWith('!') ? rule.slice(1) : rule;
+  const parts = patternToCheck.split('\\');
+  for (let index = 0; index < parts.length - 1; index++) {
+    if (/\s/.test(parts[index])) {
+      return false;
+    }
+  }
+  if (patternToCheck.includes('//') || patternToCheck.includes('**/**')) {
     return false;
   }
 
-  if (
-    parsedGitIgnoreLine.includes('//') ||
-    parsedGitIgnoreLine.includes('**/**')
-  ) {
+  // Quick check for square bracket balance
+  const openBrackets = (patternToCheck.match(/\[/g) ?? []).length;
+  const closeBrackets = (patternToCheck.match(/\]/g) ?? []).length;
+  if (openBrackets !== closeBrackets) {
     return false;
   }
 
   // Hardcoded checking for problematic patterns
   if (
-    /^[./]*$/.test(parsedGitIgnoreLine) || // Matches '.', '..', '/', './', '../', etc.
-    parsedGitIgnoreLine === '/' || // Root directory
-    /^\.{2,}\/.*$/.test(parsedGitIgnoreLine) // Anything starting with multiple dots and slash
+    /^[./]*$/.test(rule) || // Matches '.', '..', '/', './', '../', etc.
+    rule === '/' || // Root directory
+    /^\.{2,}\/.*$/.test(rule) // Anything starting with multiple dots and slash
   ) {
     return false;
   }
@@ -163,31 +177,29 @@ export function isValidGitIgnoreRule(parsedGitIgnoreLine: string): boolean {
   return true;
 }
 
-// Works well for the usual cases. Doesn't try to handle all edge cases yet.
-function convertGitIgnoreRuleToPathspec(parsedGitIgnoreLine: string): string {
+function formatGitIgnoreToPathspec(pattern: string): string {
+  pattern = pattern.trim();
+
   // Handle root-relative paths
   let rootRelative = false;
-  if (parsedGitIgnoreLine.startsWith('/')) {
+  if (pattern.startsWith('/')) {
     rootRelative = true;
-    parsedGitIgnoreLine = parsedGitIgnoreLine.slice(1);
+    pattern = pattern.slice(1);
   }
 
   // For non-root patterns, prefix with **/ for a recursive match
   if (
     !rootRelative &&
-    !parsedGitIgnoreLine.startsWith('*/') &&
-    !parsedGitIgnoreLine.startsWith('**/')
+    !pattern.startsWith('*/') &&
+    !pattern.startsWith('**/')
   ) {
-    parsedGitIgnoreLine = `**/${parsedGitIgnoreLine}`;
+    pattern = `**/${pattern}`;
   }
 
   // If the pattern ends with a slash, add '**' for directory contents
-  if (
-    parsedGitIgnoreLine.endsWith('/') &&
-    !parsedGitIgnoreLine.endsWith('*/')
-  ) {
-    parsedGitIgnoreLine += '**';
+  if (pattern.endsWith('/') && !pattern.endsWith('*/')) {
+    pattern += '**';
   }
 
-  return parsedGitIgnoreLine;
+  return pattern;
 }

src/settings/ui/FileChangesNotificationThreshold.ts

@@ -1,15 +1,39 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
-export class FileChangesNotificationThreshold extends SettingComponent {
+export class FileChangesNotificationThreshold extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Custom threshold for file changes alert')
+
       .addText((text) => {
-        this.settingTab.bind(text, 'filesChangedWarningThreshold');
-
-        text.setDisabled(this.disabled);
-
+        text.setDisabled(this.disabled).onChange((value) => {
+          const newSettings = this.plugin.settingsClone;
+          newSettings.contentDeletionsAndMovesWarningThreshold =
+            validateFileChangesNotificationThreshold(value)
+              ? value
+              : DEFAULT_SETTINGS.contentDeletionsAndMovesWarningThreshold;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
+        });
         // This.restrictToPositiveIntegerInput(text);
+
+        this.setValueIfNonDefaultSetting({
+          settingsProperty: 'filesChangesWarningThreshold',
+          text
+        });
       });
   }
 }
+
+export function validateFileChangesNotificationThreshold(
+  fileChangesNotificationThreshold: string
+): boolean {
+  if (
+    !Number.isInteger(Number(fileChangesNotificationThreshold)) ||
+    Number(fileChangesNotificationThreshold) < 1
+  ) {
+    return false;
+  }
+  return true;
+}

src/settings/ui/FileExplorerStatsInterval.ts

@@ -1,13 +1,42 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS, MAX_SUPPORTED_INTERVAL } from 'settings/settings.ts';
 
-export class FileExplorerStatsInterval extends SettingComponent {
+export class FileExplorerStatsInterval extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
-      .setName('Interval for file explorer stats (minutes)')
-      .addText((text) => {
-        this.settingTab.bind(text, 'fileExplorerInterval');
 
-        text.setDisabled(this.disabled);
+      .setName('Interval for file explorer stats (minutes)')
+
+      .addText((text) => {
+        text.setDisabled(this.disabled).onChange((value) => {
+          const newSettings = this.plugin.settingsClone;
+          newSettings.fileExplorerInterval = validateFileExplorerStatsInterval(
+            value
+          )
+            ? value
+            : DEFAULT_SETTINGS.fileExplorerInterval;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
+        });
+
+        // This.restrictToPositiveIntegerInput(text, 5);
+        this.setValueIfNonDefaultSetting({
+          settingsProperty: 'fileExplorerInterval',
+          text
+        });
       });
   }
 }
+
+export function validateFileExplorerStatsInterval(
+  fileExplorerStatsInterval: string
+): boolean {
+  if (
+    !Number.isInteger(Number(fileExplorerStatsInterval)) ||
+    Number(fileExplorerStatsInterval) < 1 ||
+    Number(fileExplorerStatsInterval) > MAX_SUPPORTED_INTERVAL
+  ) {
+    return false;
+  }
+  return true;
+}

src/settings/ui/GitPluginWarning.ts

@@ -4,12 +4,13 @@ import type { Setting } from 'obsidian';
 import { compareVersions } from 'compare-versions';
 import {
   MAX_TESTED_GIT_PLUGIN_VERSION,
-  MIN_COMPATIBLE_GIT_PLUGIN_VERSION
+  MIN_COMPATIBLE_GIT_PLUGIN_VERSION,
+  PLUGIN_NAME
 } from 'constants.ts';
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 import { GitPluginState } from 'types.ts';
 
-export class GitPluginWarning extends SettingComponent {
+export class GitPluginWarning extends GitChangelogSetting {
   public display(): void {
     let desc: DocumentFragment | string;
     let setting: Setting;
@@ -21,21 +22,18 @@ export class GitPluginWarning extends SettingComponent {
         break;
       }
       case GitPluginState.IncompatibleVersion: {
-        desc = `⚠️ The installed Git plugin version is incompatible. Oldest compatible version is ${
-          MIN_COMPATIBLE_GIT_PLUGIN_VERSION
-        }`;
+        desc = '⚠️ The installed Git plugin version is incompatible.';
         break;
       }
       case GitPluginState.UntestedVersion: {
-        desc = `Compatibility with the installed Git plugin version is not tested. Latest tested version is ${
-          MAX_TESTED_GIT_PLUGIN_VERSION
-        }`;
+        desc =
+          'Compatibility with the installed Git plugin version is not tested.';
         // A button to continue using at your own risk
         break;
       }
       default: {
         desc = createFragment((fragment) => {
-          fragment.appendText(`⚠️ This plugin requires the `);
+          fragment.appendText(`⚠️ ${PLUGIN_NAME} requires the `);
           fragment.createEl('a', {
             href: 'https://github.com/Vinzent03/obsidian-git',
             text: 'Obsidian Git'

src/settings/ui/IgnoreBlankLinesToggle.ts

@@ -1,16 +0,0 @@
-import { SettingComponent } from 'settings/components/setting.ts';
-
-export class IgnoreBlankLinesToggle extends SettingComponent {
-  public display(): void {
-    this.createSetting()
-      .setName(
-        createFragment((fragment) => {
-          fragment.appendText(`Ignore changes whose lines are all blank`);
-        })
-      )
-      .setDesc(
-        "Doesn't show a file as changed if the only changes are blank lines."
-      )
-      .addToggle((toggle) => this.settingTab.bind(toggle, 'ignoreBlankLines'));
-  }
-}

src/settings/ui/IncludeItemsToggle.ts

@@ -1,26 +0,0 @@
-import { EXCLUDE_FILES_AND_FOLDERS } from 'constants.ts';
-import { appendCodeBlock } from 'obsidian-dev-utils/HTMLElement';
-import { SettingComponent } from 'settings/components/setting.ts';
-
-export class IncludeItemsToggle extends SettingComponent {
-  public display(): void {
-    this.createSetting()
-      .setName(
-        createFragment((fragment) => {
-          fragment.appendText(`Include items instead`);
-        })
-      )
-      .setDesc(
-        createFragment((fragment) => {
-          fragment.appendText('Include the items listed in ');
-          appendCodeBlock(fragment, EXCLUDE_FILES_AND_FOLDERS);
-          fragment.appendText(
-            ` instead of excluding them, and exclude everything else.`
-          );
-        })
-      )
-      .addToggle((toggle) =>
-        this.settingTab.bind(toggle, 'convertToIncludeList')
-      );
-  }
-}

src/settings/ui/MiscellaneousButtons.ts

@@ -1,13 +1,13 @@
-import { FEEDBACK_URL } from 'constants.ts';
-import { SettingComponent } from 'settings/components/setting.ts';
+import { Notice } from 'obsidian';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 
-export class MiscellaneousButtons extends SettingComponent {
+export class MiscellaneousButtons extends GitChangelogSetting {
   public display(): void {
     const bugReportDiv = this.createSetting();
     bugReportDiv.addButton((button) => {
       button.setButtonText('Give feedback');
       button.onClick(() => {
-        window.open(FEEDBACK_URL);
+        window.open('https://github.com/shumadrid/obsidian-git-changelog');
       });
     });
 
@@ -26,7 +26,7 @@ export class MiscellaneousButtons extends SettingComponent {
             4
           )
         );
-        this.plugin.displayNotice(
+        new Notice(
           'Debug information copied to clipboard. May contain sensitive information!'
         );
       });

src/settings/ui/RenameDetectionFileLimit.ts

@@ -1,24 +1,53 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
+
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
 
 // https://github.com/git/git/blob/58b5801aa94ad5031978f8e42c1be1230b3d352f/diff.c#L58 - 1000 default
-export class RenameDetectionFileLimit extends SettingComponent {
+export class RenameDetectionFileLimit extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
 
       .setName('Rename detection file limit')
       .setDesc(
-        createFragment((fragment) => {
-          fragment.appendText(
-            'If number of changed files exceeds the limit, exhaustive rename detection won’t run, though some renames may still be detected.'
-          );
-          fragment.createEl('br');
-          fragment.appendText(
-            'Be aware of potential computation costs when setting higher limits. Set 0 for no limit.'
-          );
-        })
+        'If number of changed files exceeds the limit, exhaustive rename detection won’t run, though some renames may still be detected. Be aware of potential computation costs when setting higher limits. Set 0 for no limit.'
       )
-      .addNumber((text) => {
-        this.settingTab.bind(text, 'renameLimit');
+      .addText((text) => {
+        text.inputEl.pattern = '[0-9]*';
+
+        text.inputEl.maxLength = 20;
+        text.inputEl.inputMode = 'numeric';
+        text
+          .setPlaceholder(
+            DEFAULT_SETTINGS.changelogGenerationSettings.renameLimit
+          )
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.changelogGenerationSettings.renameLimit = String(value);
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
+        // This.restrictToPositiveIntegerInput(text);
+
+        this.setValueIfNonDefaultSetting({
+          diffSettingsProperty: 'renameLimit',
+          settingsProperty: 'changelogGenerationSettings',
+          text
+        });
       });
   }
 }
+
+export function getRenameLimit(
+  changelogGenerationSettings: ChangelogGenerationSettings
+): number {
+  if (!validateRenameLimit(changelogGenerationSettings.renameLimit)) {
+    return Number(DEFAULT_SETTINGS.changelogGenerationSettings.renameLimit);
+  }
+
+  return Number(changelogGenerationSettings.renameLimit);
+}
+
+export function validateRenameLimit(renameLimit: string): boolean {
+  return Number(renameLimit) >= 0 && Number.isInteger(renameLimit);
+}

src/settings/ui/RenameDetectionStrictnessSlider.ts

@@ -1,49 +1,67 @@
-import {
-  MAX_RENAME_DETECTION_STRICTNESS,
-  MIN_RENAME_DETECTION_STRICTNESS
-} from 'constants.ts';
-import { ResetButton } from 'settings/components/resetButton.ts';
-import { SettingComponent } from 'settings/components/setting.ts';
+import type { SliderComponent } from 'obsidian';
+import type { ChangelogGenerationSettings } from 'settings/settings.ts';
 
-export class RenameDetectionStrictnessSlider extends SettingComponent {
+import { ResetButton } from 'settings/components/resetButton.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
+
+const MIN_RENAME_DETECTION_STRICTNESS = 1;
+const MAX_RENAME_DETECTION_STRICTNESS = 100;
+
+export class RenameDetectionStrictnessSlider extends GitChangelogSetting {
   public display(): void {
+    let slider: SliderComponent;
     const setting = this.createSetting()
       .setName('File move/rename detection strictness')
       .setDesc(
-        createFragment((fragment) => {
-          fragment.appendText(
-            `Flag files as renamed only if more than X% of the file hasn't changed.`
-          );
-          fragment.createEl('br');
-          fragment.appendText(
-            'Adjust this if you notice the plugin missing valid moves/renames or showing false positives.'
-          );
-        })
+        "Flag files as renamed only if more than X% of the file hasn't changed. Adjust this if you notice the plugin missing valid moves/renames or showing false positives."
       );
 
     new ResetButton(setting.controlEl).onClick(() => {
-      const defaultValue =
-        this.plugin.settingsManager.defaultSettings.renameDetectionStrictness;
-
-      // It saves to file, which we don't want to wait for
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.plugin.settingsManager.setProperty(
-        'renameDetectionStrictness',
-        defaultValue
+      slider.setValue(
+        DEFAULT_SETTINGS.changelogGenerationSettings.renameDetectionStrictness
       );
-      this.refreshDisplayWithDelay(0);
     });
 
     setting.addSlider((percent) => {
-      this.settingTab.bind(percent, 'renameDetectionStrictness');
+      slider = percent;
 
       percent
+        .setValue(
+          getRenameDetectionStrictness(
+            this.plugin.settings.changelogGenerationSettings
+          )
+        )
         .setLimits(
           MIN_RENAME_DETECTION_STRICTNESS,
           MAX_RENAME_DETECTION_STRICTNESS,
           1
         )
+        .onChange((value) => {
+          const newSettings = this.plugin.settingsClone;
+          newSettings.changelogGenerationSettings.renameDetectionStrictness =
+            value;
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          this.plugin.saveSettings(newSettings);
+        })
         .setDynamicTooltip();
     });
   }
 }
+
+export function getRenameDetectionStrictness(
+  changelogGenerationSettings: ChangelogGenerationSettings
+): number {
+  if (
+    !Number.isInteger(changelogGenerationSettings.renameDetectionStrictness) ||
+    changelogGenerationSettings.renameDetectionStrictness <
+      MIN_RENAME_DETECTION_STRICTNESS ||
+    changelogGenerationSettings.renameDetectionStrictness >
+      MAX_RENAME_DETECTION_STRICTNESS
+  ) {
+    return DEFAULT_SETTINGS.changelogGenerationSettings
+      .renameDetectionStrictness;
+  }
+
+  return changelogGenerationSettings.renameDetectionStrictness;
+}

src/settings/ui/ReviewChangesReminderInterval.ts

@@ -1,139 +0,0 @@
-import type GitChangelogPlugin from 'main.ts';
-
-import { COMPARE_TO_CHECKPOINT_VIEW_CONFIG } from 'constants.ts';
-import { Notice } from 'obsidian';
-import { invokeAsyncSafely } from 'obsidian-dev-utils/Async';
-import { SettingComponent } from 'settings/components/setting.ts';
-import { removeCompareVersionsView } from 'utils.ts';
-
-export class ReviewChangesReminderInterval extends SettingComponent {
-  public display(): void {
-    this.createSetting()
-      .setName(
-        createFragment((fragment) => {
-          fragment.appendText('Review changes reminder interval');
-          fragment
-            .createEl('span', {
-              cls: 'nav-file-tag git-changelog-new'
-            })
-            .setText('NEW');
-        })
-      )
-
-      .setDesc(
-        createFragment((fragment) => {
-          fragment.appendText(
-            'How often to remind you to review changes made inside the vault (minutes).'
-          );
-          fragment.createEl('br');
-          fragment.appendText('Set 0 to disable reminders.');
-        })
-      )
-      .addNumber((text) => {
-        this.settingTab.bind(text, 'reviewChangesReminderInterval');
-      });
-  }
-}
-
-/**
- * Dismisses the checkpoint reminder notification if present.
- */
-export async function dismissCheckpointReminder(
-  plugin: GitChangelogPlugin,
-  hide: boolean
-): Promise<void> {
-  if (plugin.checkpointReminderNotice) {
-    if (hide) {
-      plugin.checkpointReminderNotice.hide();
-    }
-    plugin.checkpointReminderNotice = undefined;
-  }
-  await resetCheckpointReminderCounter(plugin);
-}
-
-/**
- * Resets the activeMinutesPassedSinceLastCheckpoint counter in settings.
- */
-export async function resetCheckpointReminderCounter(
-  plugin: GitChangelogPlugin
-): Promise<void> {
-  await plugin.settingsManager.editAndSave((settings) => {
-    settings.activeMinutesPassedSinceLastCheckpoint = 0;
-  });
-}
-
-/**
- * Handles the minute interval for checkpoint reminders.
- */
-export async function handleReviewChangesReminderInterval(
-  plugin: GitChangelogPlugin
-): Promise<void> {
-  const { reviewChangesReminderInterval } = plugin.settings;
-  if (!reviewChangesReminderInterval || reviewChangesReminderInterval <= 0) {
-    await dismissCheckpointReminder(plugin, true);
-    return;
-  }
-  // Don't show if already open
-  if (plugin.checkpointReminderNotice) return;
-
-  // Increment counter in settings
-  await plugin.settingsManager.editAndSave((settings) => {
-    settings.activeMinutesPassedSinceLastCheckpoint =
-      (settings.activeMinutesPassedSinceLastCheckpoint || 0) + 1;
-  });
-
-  if (
-    plugin.settings.activeMinutesPassedSinceLastCheckpoint >=
-    reviewChangesReminderInterval
-  ) {
-    showCheckpointReminder(plugin);
-  }
-}
-
-/**
- * Shows the checkpoint reminder notification if not already shown.
- */
-export function showCheckpointReminder(plugin: GitChangelogPlugin): void {
-  if (plugin.checkpointReminderNotice) return;
-  const frag = createFragment((element) => {
-    element.createEl('span', {
-      text: `Git changelog:\nIt's time to review the changes made to your vault. 🧐`
-    });
-    element.createEl('br');
-
-    const openButton = element.createEl('button', {
-      text: 'Review'
-    });
-    openButton.style.marginTop = '8px';
-    openButton.classList.add('mod-cta');
-    openButton.addEventListener('click', () => {
-      invokeAsyncSafely(() => openCompareToCheckpointView(plugin, false));
-    });
-    const dismissButton = element.createEl('button', {
-      text: 'Remind me later'
-    });
-    dismissButton.style.marginLeft = '8px';
-    dismissButton.addEventListener('click', () => {
-      invokeAsyncSafely(() => dismissCheckpointReminder(plugin, false));
-    });
-  });
-  plugin.checkpointReminderNotice = new Notice(frag, 0);
-}
-
-export async function openCompareToCheckpointView(
-  plugin: GitChangelogPlugin,
-  hideCheckpointReminder = true
-): Promise<void> {
-  // First close any existing COMPARE_REPO_STATES_VIEW views
-  removeCompareVersionsView(plugin);
-
-  await plugin.app.workspace.ensureSideLeaf(
-    COMPARE_TO_CHECKPOINT_VIEW_CONFIG.type,
-    'left',
-    { reveal: true }
-  );
-
-  invokeAsyncSafely(() =>
-    dismissCheckpointReminder(plugin, hideCheckpointReminder)
-  );
-}

src/settings/ui/StatusBarInterval.ts

@@ -1,16 +1,60 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import type { GitChangelogPluginSettings } from 'settings/settings.ts';
+import type { ReadonlyDeep } from 'type-fest';
 
-export class StatusBarInterval extends SettingComponent {
+import { GitChangelogSetting } from 'settings/components/setting.ts';
+import { DEFAULT_SETTINGS, MAX_SUPPORTED_INTERVAL } from 'settings/settings.ts';
+
+export class StatusBarInterval extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Interval for status bar stats (minutes)')
       .setDesc(
         'Works by comparing the live file version against the first commit before the interval.'
       )
-      .addNumber((text) => {
-        this.settingTab.bind(text, 'statusBarInterval');
+      .addText((text) => {
+        text.inputEl.pattern = '[1-9][0-9]*';
+        text.inputEl.maxLength = MAX_SUPPORTED_INTERVAL.toString().length;
+        text.inputEl.inputMode = 'numeric';
+        text
+          .setDisabled(this.disabled)
+          .setPlaceholder(DEFAULT_SETTINGS.statusBarInterval)
+          .onChange((value) => {
+            const newSettings = this.plugin.settingsClone;
+            newSettings.statusBarInterval = validateStatusBarInterval(
+              String(value)
+            )
+              ? String(value)
+              : DEFAULT_SETTINGS.statusBarInterval;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+          });
 
-        text.setDisabled(this.disabled);
+        this.setValueIfNonDefaultSetting({
+          settingsProperty: 'statusBarInterval',
+          text
+        });
       });
   }
 }
+
+export function getStatusBarInterval(
+  settings: ReadonlyDeep<GitChangelogPluginSettings>
+): number {
+  if (!validateStatusBarInterval(settings.statusBarInterval)) {
+    return Number(DEFAULT_SETTINGS.statusBarInterval);
+  }
+  return Number(settings.statusBarInterval);
+}
+
+export function validateStatusBarInterval(
+  statusBarAlternateInterval: string
+): boolean {
+  if (
+    !Number.isInteger(Number(statusBarAlternateInterval)) ||
+    Number(statusBarAlternateInterval) < 1 ||
+    Number(statusBarAlternateInterval) > MAX_SUPPORTED_INTERVAL
+  ) {
+    return false;
+  }
+  return true;
+}

src/settings/ui/StatusBarStatsToggle.ts

@@ -1,15 +1,27 @@
-import { SettingComponent } from 'settings/components/setting.ts';
+import { GitChangelogSetting } from 'settings/components/setting.ts';
 
-export class StatusBarStatsToggle extends SettingComponent {
+export class StatusBarStatsToggle extends GitChangelogSetting {
   public display(): void {
     this.createSetting()
       .setName('Active note live status bar stats')
-      .addToggle((toggle) => {
-        this.settingTab.bind(toggle, 'showStatusBarStats', {
-          onChanged: () => {
-            this.refreshDisplayWithDelay();
-          }
-        });
-      });
+      .addToggle((toggle) =>
+        toggle
+          .setValue(this.plugin.settings.statusBarStats)
+          .onChange((value) => {
+            this.refreshDisplayDelayed();
+
+            const newSettings = this.plugin.settingsClone;
+            newSettings.statusBarStats = value;
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this.plugin.saveSettings(newSettings);
+
+            if (value) {
+              this.plugin.initStatusBar();
+            } else {
+              this.plugin.statusBarStats?.destroy?.();
+              this.plugin.statusBarStats = undefined;
+            }
+          })
+      );
   }
 }

src/settings/ui/WhitespaceIgnoreMode.ts

@@ -1,32 +0,0 @@
-import { SettingComponent } from 'settings/components/setting.ts';
-import { WhitespaceIgnoreMode } from 'types.ts';
-
-export class WhitespaceIgnoreModeOptions extends SettingComponent {
-  public display(): void {
-    this.createSetting()
-      .setName(
-        createFragment((fragment) => {
-          fragment.appendText(`Whitespace changes detection`);
-        })
-      )
-      .addTypedDropdown((dropdown) => {
-        dropdown.addOption(
-          WhitespaceIgnoreMode.None,
-          'Track all whitespace changes'
-        );
-        dropdown.addOption(
-          WhitespaceIgnoreMode.SpaceAtEol,
-          'Ignore whitespace changes at end of line'
-        );
-        dropdown.addOption(
-          WhitespaceIgnoreMode.SpaceChange,
-          'Ignore changes to pre-existing whitespace'
-        );
-        dropdown.addOption(
-          WhitespaceIgnoreMode.AllSpace,
-          'Ignore all whitespace changes per line'
-        );
-        this.settingTab.bind(dropdown, 'whitespaceIgnoreMode');
-      });
-  }
-}

src/settings/ui/WhitespaceSettingsHeading.ts

@@ -1,12 +0,0 @@
-import { SettingComponent } from 'settings/components/setting.ts';
-
-export class WhitespaceSettingsHeading extends SettingComponent {
-  public display(): void {
-    this.createSetting()
-      .setHeading()
-      .setName('Whitespace settings')
-      .setDesc(
-        `Note that adjusting these settings will make the generated stats slightly differ from the diff view, because unlike the diff algorithm, these settings can't be applied globally.`
-      );
-  }
-}

src/settings/validation/changelogInterval.ts

@@ -0,0 +1,32 @@
+import type GitChangelogPlugin from 'main.ts';
+
+import { DEFAULT_SETTINGS } from 'settings/settings.ts';
+import { ChangelogInterval } from 'types.ts';
+
+// Redundant currently
+export function getChangelogIntervalFromSettings(
+  plugin: GitChangelogPlugin,
+  fileOrVault: 'file' | 'vault'
+): ChangelogInterval {
+  const interval =
+    fileOrVault === 'file'
+      ? plugin.settings.fileChangelogInterval
+      : plugin.settings.vaultChangelogGenerationSettings.interval;
+
+  if (!validateChangelogInterval(interval)) {
+    return fileOrVault === 'file'
+      ? DEFAULT_SETTINGS.fileChangelogInterval
+      : DEFAULT_SETTINGS.vaultChangelogGenerationSettings.interval;
+  }
+
+  return interval;
+}
+
+export function validateChangelogInterval(
+  changelogInterval: ChangelogInterval
+): boolean {
+  if (Object.values(ChangelogInterval).includes(changelogInterval)) {
+    return true;
+  }
+  return false;
+}

src/statusBar.ts

@@ -1,13 +1,16 @@
-import type { GitChangelogPluginTypes } from 'constants.ts';
-import type { ExtractPluginSettingsWrapper } from 'obsidian-dev-utils/obsidian/Plugin/PluginTypesBase';
+import type { GitChangelogPluginSettings } from 'settings/settings.ts';
 import type { TaskManager } from 'TaskManager.svelte.ts';
 import type { ReadonlyDeep } from 'type-fest';
 
-import { findFirstFileCommitBefore } from 'core/findFirstFileCommitBefore.ts';
+import { findFirstCommitBefore } from 'core/gitOperations/findFirstCommitBefore.ts';
 import { runCheckIgnore } from 'core/gitOperations/runCheckIgnore.ts';
 import { runWorkingDirFileDiff } from 'core/gitOperations/runWorkingDirFileDiff.ts';
 import { MarkdownView } from 'obsidian';
-import { AbortError, DiffMeasurementUnit } from 'types.ts';
+import { invokeAsyncSafely } from 'obsidian-dev-utils/Async';
+import { clearPendingQueueItems } from 'obsidian-dev-utils/obsidian/Queue';
+import { getMeasurementUnit } from 'settings/ui/ChangelogMeasurementUnit.ts';
+import { getStatusBarInterval } from 'settings/ui/StatusBarInterval.ts';
+import { DiffMeasurementUnit } from 'types.ts';
 import { getGitRelativeFilePath } from 'Views/helper.ts';
 
 import type GitChangelogPlugin from './main.ts';
@@ -19,7 +22,6 @@ export class StatusBarStats {
     public taskManager: TaskManager
   ) {
     // Initialize immediately
-    this.setText('+... -...');
     this.recompute();
 
     // It doesn't listen to obsidian-git:head-change event because it always compares the working directory to some past commit anyway.
@@ -35,9 +37,6 @@ export class StatusBarStats {
 
     this.plugin.registerEvent(
       this.plugin.app.workspace.on('file-open', () => {
-        // Set loading state
-        this.setText('+... -...');
-        // Then schedule a recompute
         this.recompute();
       })
     );
@@ -53,7 +52,8 @@ export class StatusBarStats {
 
     this.plugin.registerEvent(
       this.plugin.app.workspace.on('editor-change', () => {
-        this.recompute();
+        // Previous operations aren't aborted because this will be triggered often, and the results will lag behind if new calls ones keep getting scheduled and resetting the previous calls before they finish.
+        this.recompute(false);
       })
     );
 
@@ -67,16 +67,11 @@ export class StatusBarStats {
   }
 
   public static generationSettingsChanged(
-    oldSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >,
-    newSettings: ReadonlyDeep<
-      ExtractPluginSettingsWrapper<GitChangelogPluginTypes>
-    >
+    oldSettings: ReadonlyDeep<GitChangelogPluginSettings>,
+    newSettings: GitChangelogPluginSettings
   ): boolean {
     return (
-      oldSettings.safeSettings.statusBarInterval !==
-      newSettings.safeSettings.statusBarInterval
+      getStatusBarInterval(oldSettings) !== getStatusBarInterval(newSettings)
     );
   }
 
@@ -91,10 +86,7 @@ export class StatusBarStats {
 
   private async updateStats(abortSignal: AbortSignal): Promise<void> {
     try {
-      if (abortSignal.aborted) {
-        throw new AbortError();
-      }
-      if (this.plugin.settings.showStatusBarStats) {
+      if (this.plugin.settings.statusBarStats) {
         const result = await this.calculateStatsForActiveFile(
           this.plugin.app.workspace.getActiveViewOfType(MarkdownView),
           abortSignal
@@ -105,20 +97,24 @@ export class StatusBarStats {
           this.setText('');
         }
       }
-    } catch (error) {
-      // If the error was an AbortError, don't do anything. Otherwise, remove the status bar stats.
-      if (!(error instanceof AbortError)) {
-        this.setText('');
-      }
+    } catch {
+      this.setText('');
     }
   }
 
-  private recompute(): void {
-    const abortSignal = this.taskManager.abortPreviousTasksAndGetSignal();
+  private recompute(reset = true): void {
+    // Stop the massive build-up of updateStats() calls when the user is typing
+    clearPendingQueueItems(this.plugin.app);
 
-    this.taskManager.enqueueSafely(async () => {
-      await this.updateStats(abortSignal);
-    });
+    const abortSignal = reset
+      ? this.taskManager.abortPreviousTasksAndGetSignal()
+      : this.taskManager.getAbortSignal();
+
+    invokeAsyncSafely(() =>
+      this.taskManager.enqueueAndWait(async () => {
+        await this.updateStats(abortSignal);
+      })
+    );
   }
 
   private async calculateStatsForActiveFile(
@@ -137,26 +133,18 @@ export class StatusBarStats {
     let additions = 0;
     let deletions = 0;
 
-    const git = await this.plugin.getGit();
-
-    const oldCommit = await findFirstFileCommitBefore({
+    const oldCommit = await findFirstCommitBefore({
       abortSignal,
       filePath: activeGitFile,
-      minutes: this.plugin.settings.statusBarInterval,
-      timeZone: await this.plugin.getEmptyTreeHash(),
-      git,
-      renameDetectionStrictness: this.plugin.settings.renameDetectionStrictness
+      minutes: getStatusBarInterval(this.plugin.settings),
+      plugin: this.plugin
     });
 
-    if (oldCommit && oldCommit.fileDeleted !== true) {
+    if (oldCommit) {
       const baseStats = await runWorkingDirFileDiff({
         abortSignal,
         oldCommit,
-        activeGitFile,
-        git,
-        diffAlgorithm: this.plugin.settings.diffAlgorithm,
-        whitespaceIgnoreMode: this.plugin.settings.whitespaceIgnoreMode,
-        ignoreBlankLines: this.plugin.settings.ignoreBlankLines
+        plugin: this.plugin
       });
       if (baseStats) {
         additions = baseStats.additions;
@@ -171,13 +159,15 @@ export class StatusBarStats {
       const fileIsGitIgnored = await runCheckIgnore({
         abortSignal,
         activeGitFile,
-        git
+        plugin: this.plugin
       });
 
       if (fileIsGitIgnored) {
-        return 'In .gitignore';
+        return;
       }
-      const measurementUnit = this.plugin.settings.diffMeasurementUnit;
+      const measurementUnit = getMeasurementUnit(
+        this.plugin.settings.changelogGenerationSettings
+      );
 
       if (measurementUnit === DiffMeasurementUnit.Lines) {
         additions = activeFileView.editor.lineCount();

src/styles/main.scss

@@ -17,28 +17,6 @@
   border-bottom: 1px solid var(--text-warning);
 }
 
-.git-changelog-top-margin {
-  margin-top: var(--size-4-1);
-}
-
-.git-changelog-on-checkpoint-commit-icon {
-  vertical-align: middle;
-}
-
-.git-changelog-compared-versions-container {
-  display: flex;
-  flex-direction: column;
-  gap: var(--size-4-1);
-  margin-bottom: var(--size-4-1);
-  justify-content: center;
-  align-items: center;
-  margin-top: var(--size-2-1);
-}
-
-.git-changelog-force-center {
-  align-self: center !important;
-}
-
 .git-changelog-align-file {
   align-items: center;
   width: 100%;
@@ -119,14 +97,14 @@
 // Layout components
 .git-changelog-text-area {
   width: 100%;
-  max-width: 480px;
-  min-width: 260px;
-  min-height: 6em;
-  height: auto;
+  max-width: 500px;
+  min-width: 250px;
+  min-height: 5em;
 }
 
 .git-changelog-view {
   --git-changelog-opacity: 0.84;
+
   display: flex;
   flex-direction: column;
   position: relative;
@@ -134,18 +112,6 @@
   padding-bottom: calc(2 * var(--size-4-1));
 }
 
-.git-changelog-checkpoint-modal {
-  align-items: center;
-  flex-direction: column;
-  justify-content: center;
-  align-content: center;
-  display: flex;
-}
-
-.git-changelog-approve-button {
-  align-self: center;
-}
-
 .git-changelog-entry-title {
   @extend .git-changelog-one-line;
   color: var(--text-accent);
@@ -154,16 +120,6 @@
   margin-bottom: var(--size-4-1);
 }
 
-.git-changelog-compared-version-title {
-  @extend .git-changelog-one-line;
-  color: var(--text-muted);
-  font-size: var(--font-smaller);
-}
-
-.git-changelog-compared-version-title-arrow {
-  color: var(--text-faint);
-}
-
 .git-changelog-initial-version-tag {
   @extend .git-changelog-one-line;
   font-size: 0.75em;
@@ -213,33 +169,9 @@
   gap: var(--size-2-2);
 }
 
-.git-changelog-left-padding {
-  margin-left: var(--size-4-4);
-}
-
-.git-changelog-setting-label {
-  padding: 0 var(--size-4-2);
-  transform: translateY(-1px); // workaround to appear centered
-  display: inline-flex;
-}
-
-.git-changelog-new {
-  @extend .git-changelog-setting-label;
-  color: var(--color-green);
-  background-color: rgba(var(--color-green-rgb), 0.15);
-}
-
-.git-changelog-experimental {
-  @extend .git-changelog-setting-label;
-  color: var(--color-orange);
-  background-color: rgba(var(--color-orange-rgb), 0.15);
-}
-
 /* Sticky view header and padding fixes */
 .workspace-leaf-content {
   &[data-type='vault-changelog-view'] .view-content,
-  &[data-type='vault-git-history-comparison-view'] .view-content,
-  &[data-type='compare-to-checkpoint-view'] .view-content,
   &[data-type='file-changelog-view'] .view-content {
     padding: 0;
   }

src/timeUtils.ts

@@ -3,35 +3,32 @@ import type { Spacetime } from 'spacetime';
 import type { LogEntry } from 'types.ts';
 
 /**
- *  This function produces "fullyAdjusted" dates, which are dates that have the "day start time" setting applied to a "timeAdjustedDate". timeZoneAdjustedDate is a date adjusted with the timeZone setting specified in the settings tab.
+ *  This function produces "fullyAdjusted" dates, which are dates that have the "day start time" setting applied to a "timeAdjustedDate". timezoneAdjustedDate is a date adjusted with the timezone setting specified in the settings tab.
  */
-export function applyDayStartHourSetting({
-  dayStartHour,
-  timeZoneAdjustedDate
+export function applyDayStartTimeSetting({
+  dayStartTime,
+  timezoneAdjustedDate
 }: {
-  dayStartHour: number;
-  timeZoneAdjustedDate: Spacetime;
+  dayStartTime: number;
+  timezoneAdjustedDate: Spacetime;
 }): Spacetime {
-  return timeZoneAdjustedDate.subtract(dayStartHour, 'hours');
+  return timezoneAdjustedDate.subtract(dayStartTime, 'hours');
 }
 
-export function getDayStartHourAdjustedLogs(
+export function getDayStartTimeAdjustedLogs(
   logEntries: LogEntry[],
-  dayStartHour: number
+  dayStartTime: number
 ): LogEntry[] {
-  if (dayStartHour === 0) {
+  if (dayStartTime === 0) {
     return logEntries;
   }
   return logEntries.map((entry) => {
     return {
       ...entry,
-      fullyAdjustedDate: applyDayStartHourSetting({
-        dayStartHour,
-        timeZoneAdjustedDate: entry.timeZoneAdjustedDate
+      fullyAdjustedDate: applyDayStartTimeSetting({
+        dayStartTime,
+        timezoneAdjustedDate: entry.timezoneAdjustedDate
       })
     };
   });
 }
-export function formatDateHour(date: Spacetime): string {
-  return date.startOf('hour').format('iso-utc');
-}

src/types.ts

@@ -29,13 +29,6 @@ export class AbortError extends Error {
   }
 }
 
-export class NullValueError extends Error {
-  public constructor() {
-    super('Non-nullable value is null or undefined');
-    this.name = 'NullValueError';
-  }
-}
-
 declare module 'obsidian' {
   interface Workspace {
     on(
@@ -48,16 +41,8 @@ declare module 'obsidian' {
       callback: () => void,
       context?: unknown
     ): EventRef;
-    on(
-      name: 'git-changelog:menu',
-      callback: (
-        menu: Menu,
-        inFileMenu: boolean,
-        gitRelativePath?: string,
-        commitHash?: string
-      ) => void,
-      context?: unknown
-    ): EventRef;
+
+    // BUG:? Read directly from settings instead of passing as arguments?
     trigger(
       name:
         | 'git-changelog:active-git-file-changed'
@@ -66,21 +51,6 @@ declare module 'obsidian' {
         | 'git-changelog:status-bar-settings-changed'
         | 'git-changelog:vault-changelog-generation-settings-changed'
     ): void;
-    trigger(
-      name: 'git-changelog:menu',
-      menu: Menu,
-      // Is the menu standalone, or are it's items added to the existing file menu?
-      inFileMenu: boolean,
-      gitRelativePath?: string,
-      commitHash?: string
-    ): void;
-    trigger(
-      name: 'file-menu',
-      menu: Menu,
-      file: TAbstractFile,
-      source: string,
-      leaf?: WorkspaceLeaf
-    ): void;
   }
 }
 
@@ -91,23 +61,10 @@ export enum ChangelogInterval {
   Weekly = 'week'
 }
 
-/**
- * Patience and Histogram algorithms don't make sense for this use case.
- */
 export enum DiffAlgorithm {
+  Default = 'Default', // Myers algorithm
   Inherit = 'Inherit',
-  Default = 'default', // Myers algorithm
-  Minimal = 'minimal'
-}
-
-export enum WhitespaceIgnoreMode {
-  None = 'None',
-  SpaceAtEol = 'SpaceAtEol',
-  SpaceChange = 'SpaceChange', // Superset of SpaceAtEol
-  AllSpace = 'AllSpace' // Superset of SpaceChange
-  // None = 'None',
-  // Git lacks a `--no-ignore-whitespace` flag.
-  // `core.whitespace` is related to fixing whitespace issues, not ignoring whitespace in diffs.
+  Minimal = 'Minimal'
 }
 
 /**
@@ -135,7 +92,7 @@ export enum FileExplorerStats {
   FoldersAndNotes = 'FoldersAndNotes'
 }
 
-export enum FileSummariesDisplayMode {
+export enum FilesSummariesDisplayMode {
   TextAndBinary = 'Text and binary',
   Total = 'Total'
   // Binary = "Binary",
@@ -168,24 +125,20 @@ export interface FilesSummary {
   addedFiles: number;
   deletedFiles: number;
   modifiedFiles: number;
-  renamedAndMovedFiles: number;
-}
-
-export interface CompareRepoCommitsViewState {
-  utcOlderDate: string;
-  utcNewerDate: string;
+  renamedFiles: number;
 }
 
 export interface LogEntry {
   // Can be null for file logs, if the file was deleted in some commit
   hash: string;
-  timeZoneAdjustedDate: Spacetime;
+  timezoneAdjustedDate: Spacetime;
 
   // For file git logs only:
   // To track file renames through history
   filePath?: string;
   // Covers a deleted edge-case
   fileDeleted?: boolean;
+  binary?: boolean;
 }
 
 export interface StatEntry {

src/utils.ts

@@ -1,16 +1,10 @@
 /* eslint-disable unicorn/prevent-abbreviations */
-import type { GitChangelogPlugin } from 'GitChangelogPlugin.svelte.ts';
 import type { App, WorkspaceLeaf } from 'obsidian';
 import type { DiffFile, TextDiffStats } from 'types.ts';
 
-import {
-  COMPARE_REPO_COMMITS_VIEW_CONFIG,
-  COMPARE_TO_CHECKPOINT_VIEW_CONFIG,
-  FEEDBACK_URL
-} from 'constants.ts';
 // Import * as cssColorConverter from "css-color-converter";
-import { Keymap, Notice } from 'obsidian';
-import { DiffFileStatus, NullValueError } from 'types.ts';
+import { Keymap, Menu } from 'obsidian';
+import { DiffFileStatus } from 'types.ts';
 
 export function getFileNameFromPath({
   normalizedFilePath
@@ -70,6 +64,41 @@ export function isRenamed(file: DiffFile): boolean {
   );
 }
 
+export function mayTriggerFileMenu({
+  app,
+  event,
+  filePath,
+  source,
+  view
+}: {
+  app: App;
+  event: MouseEvent;
+  filePath: string;
+  source: string;
+  view: WorkspaceLeaf;
+}): void {
+  // eslint-disable-next-line eqeqeq
+  if (event.button == 2) {
+    const file = app.vault.getAbstractFileByPath(filePath);
+    // eslint-disable-next-line eqeqeq
+    if (file == undefined) {
+      const fileMenu = new Menu();
+      app.workspace.trigger(
+        'obsidian-git:menu',
+        fileMenu,
+        filePath,
+        source,
+        view
+      );
+      fileMenu.showAtPosition({ x: event.pageX, y: event.pageY });
+    } else {
+      const fileMenu = new Menu();
+      app.workspace.trigger('file-menu', fileMenu, file, source, view);
+      fileMenu.showAtPosition({ x: event.pageX, y: event.pageY });
+    }
+  }
+}
+
 export function parseContentChange({
   addedStr,
   deletedStr
@@ -95,44 +124,3 @@ export function parseContentChange({
 
   return textDiffStats;
 }
-
-export function assertNotNull<T>(value: null | T | undefined): T {
-  DEV: if (value === null || value === undefined) {
-    const error = new NullValueError();
-    const stack = error.stack ?? '';
-    const message = `Git changelog:\nNon-nullable value is null or undefined`;
-    console.error(`${message}\n${stack}`);
-    const fragment = createFragment((el) => {
-      el.createEl('p', {
-        text: 'Git changelog:\nHey, some null error happened that shouldn`t have.\nCan you please copy the error info and report it to the Github issues page so that it can get fixed.\nJust paste the copied info, nothing more'
-      });
-
-      const button = el.createEl('button', { text: 'Copy & Report Issue' });
-      button.addEventListener('click', () => {
-        window.navigator.clipboard
-          .writeText(stack)
-          .then(() => {
-            window.open(FEEDBACK_URL);
-          })
-          // eslint-disable-next-line @typescript-eslint/no-empty-function
-          .catch(() => {});
-      });
-    });
-
-    new Notice(fragment, 0);
-
-    throw error;
-  }
-  return value;
-}
-
-export function removeCompareVersionsView(plugin: GitChangelogPlugin): void {
-  // Close any existing temporary views
-  plugin.app.workspace.detachLeavesOfType(
-    COMPARE_TO_CHECKPOINT_VIEW_CONFIG.type
-  );
-
-  plugin.app.workspace.detachLeavesOfType(
-    COMPARE_REPO_COMMITS_VIEW_CONFIG.type
-  );
-}

versions.json

@@ -1,10 +1,5 @@
 {
-  "0.1.0": "1.8.9",
-  "0.2.0": "1.8.9",
-  "0.2.1": "1.8.9",
-  "0.3.0": "1.8.9",
-  "0.4.0": "1.8.9",
-  "0.5.0": "1.8.9",
-  "0.5.1": "1.8.10",
-  "0.6.0": "1.8.10"
+  "0.1.0": "1.7.2",
+  "0.2.0": "1.7.2",
+  "0.2.1": "1.7.2"
 }