generated from obsidianmd/obsidian-sample-plugin
-
Notifications
You must be signed in to change notification settings - Fork 112
fix: consider checking params in checkCallback
#1324
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
687a1c0
chore: fix typings for obsidian 1.9.0
kdnk 029de94
fix: consider checking parameter in original save callback
kdnk 5546682
fix: return undefined using void
kdnk ca33bf1
fix: use originSaveCallback when checking
kdnk ce72500
chore: fix lint
kdnk 64d00ab
fix: run original checkCallback as well when not checking
kdnk 25863f0
chore: get back `editor` and `file` definition inside if statement
kdnk 4f6c735
chore: add missing semicolon
kdnk 21065d2
chore: remove unnecessary newline
kdnk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,7 +66,7 @@ | |
| private overridePaste: boolean = false; | ||
| private hasCustomCommands: boolean = false; | ||
| private customCommandsLock = new AsyncLock(); | ||
| private originalSaveCallback?: () => void = null; | ||
| private originalSaveCallback?: (checking: boolean) => boolean | void = null; | ||
| // The amount of files you can use editor lint on at once is pretty small, so we will use an array | ||
| private editorLintFiles: TFile[] = []; | ||
| // the amount of files that can be linted as a file can be quite large, so we will want to use a set to make | ||
|
|
@@ -322,15 +322,20 @@ | |
| this.originalSaveCallback = saveCommandDefinition?.checkCallback; | ||
|
|
||
| if (typeof this.originalSaveCallback === 'function') { | ||
| saveCommandDefinition.checkCallback = () => { | ||
| this.originalSaveCallback(); | ||
| saveCommandDefinition.checkCallback = (checking: boolean) => { | ||
|
|
||
| if (checking) { | ||
| return this.originalSaveCallback(checking); | ||
| } else { | ||
| this.originalSaveCallback(checking) | ||
|
|
||
| if (this.settings.lintOnSave && this.isEnabled) { | ||
| const editor = this.getEditor(); | ||
| if (editor) { | ||
| const file = this.app.workspace.getActiveFile(); | ||
| if (!this.shouldIgnoreFile(file) && this.isMarkdownFile(file) && editor.cm) { | ||
| void this.runLinterEditor(editor); | ||
| const file = this.app.workspace.getActiveFile(); | ||
| if (this.settings.lintOnSave && this.isEnabled) { | ||
| if (editor) { | ||
| if (!this.shouldIgnoreFile(file) && this.isMarkdownFile(file) && editor.cm) { | ||
| void this.runLinterEditor(editor); | ||
| } | ||
|
||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.