Improved auto-fix of corrupted files.

Author: Developer-Mike

src/@types/Obsidian.d.ts

@@ -18,6 +18,8 @@ declare module "obsidian" {
      */
     lastEvent: UserEvent | null
 
+    internalPlugins: any
+
     // Custom
     /** @public */
     workspace: Workspace & ExtendedWorkspace

src/core/canvas-patcher.ts

@@ -37,7 +37,6 @@ export default class CanvasPatcher {
     ) as CanvasView
 
     // Patch canvas view
-    const fixBrokenCanvasFiles = this.plugin.settings.getSetting('fixBrokenCanvasFiles')
     PatchHelper.patchObjectPrototype(this.plugin, canvasView, {
       getViewData: (_next: any) => function (..._args: any) {
         const canvasData = this.canvas.getData()
@@ -52,10 +51,12 @@ export default class CanvasPatcher {
         // Check for SyntaxError
         try { parsedJson = JSON.parse(json) }
         catch (e) {
-          if (fixBrokenCanvasFiles) {
-            parsedJson = JSONC.parse(json)
-            validJson = JSON.stringify(parsedJson, null, 2)
-          }
+          // Invalid JSON
+          that.plugin.createFileSnapshot(this.file.path, json)
+          
+          // Try to parse it with trailing commas
+          parsedJson = JSONC.parse(json)
+          validJson = JSON.stringify(parsedJson, null, 2)
         }
 
         const result = next.call(this, validJson, ...args)

src/main.ts

@@ -88,16 +88,23 @@ export default class AdvancedCanvasPlugin extends Plugin {
 
   onunload() {}
 
-  getCurrentCanvasView(): CanvasView|null {
+  getCurrentCanvasView(): CanvasView | null {
     const canvasView = this.app.workspace.getActiveViewOfType(ItemView)
     if (canvasView?.getViewType() !== 'canvas') return null
     return canvasView as CanvasView
   }
 
-  getCurrentCanvas(): Canvas|null {
+  getCurrentCanvas(): Canvas | null {
     return this.getCurrentCanvasView()?.canvas || null
   }
 
+  createFileSnapshot(path: string, content: string) {
+    const fileRecoveryPlugin = this.app.internalPlugins.plugins['file-recovery']?.instance
+    if (!fileRecoveryPlugin) return
+
+    fileRecoveryPlugin.forceAdd(path, content)
+  }
+
   // this.app.plugins.plugins["advanced-canvas"].enableDebugMode()
   enableDebugMode() {
     if (this.debugHelper) return

src/settings.ts

@@ -15,7 +15,6 @@ export interface AdvancedCanvasPluginSettings {
   defaultFileNodeWidth: number
   defaultFileNodeHeight: number
 
-  fixBrokenCanvasFiles: boolean
   performanceOptimizationEnabled: boolean
 
   nodeStylingFeatureEnabled: boolean
@@ -68,7 +67,6 @@ export const DEFAULT_SETTINGS: Partial<AdvancedCanvasPluginSettings> = {
   defaultFileNodeWidth: 400,
   defaultFileNodeHeight: 400,
 
-  fixBrokenCanvasFiles: false,
   performanceOptimizationEnabled: false,
 
   nodeStylingFeatureEnabled: true,
@@ -221,13 +219,6 @@ export class AdvancedCanvasPluginSettingTab extends PluginSettingTab {
           .onChange(async (value) => await this.settingsManager.setSetting({ defaultFileNodeHeight: Math.max(1, parseInt(value)) }))
       )
 
-    this.createFeatureHeading(
-      containerEl,
-      "Fix broken canvas files",
-      "Fix broken canvas files by removing trailing commas. (This is a workaround for a bug in Obsidian. It happens if you edit an advanced canvas file without the plugin enabled. I suggest you to only enable this if you encounter the error: Failed to open \"\")",
-      'fixBrokenCanvasFiles'
-    )
-
     this.createFeatureHeading(
       containerEl,
       "Performance optimization",