Default to using a diff when tracking source dates

package.json

@@ -233,15 +233,6 @@
 								"default": false,
 								"description": "When enabled, Code for IBM i will retain/update source dates of members when editing source members. Requires SQL to be enabled for this feature to work. If this config is changed, you must reconnect to the system."
 							},
-							"sourceDateMode": {
-								"type": "string",
-								"default": "diff",
-								"enum": [
-									"diff",
-									"edit"
-								],
-								"description": "Determine which method should be used to track changes to source dates for source member."
-							},
 							"sourceDateGutter": {
 								"type": "boolean",
 								"default": false,
@@ -490,11 +481,6 @@
 					"default": false,
 					"description": "If enabled, when the user tries to delete a directory, they will be asked to confirm the deletion by typing in the directory's name."
 				},
-				"code-for-ibmi.showDateSearchButton": {
-					"type": "boolean",
-					"default": true,
-					"description": "If enabled, will show the 'Date search' button in the status bar when source dates with diff mode is enabled."
-				},
 				"code-for-ibmi.terminals.5250.openInEditorArea": {
 					"type": "boolean",
 					"default": true,
@@ -1068,13 +1054,13 @@
 			},
 			{
 				"command": "code-for-ibmi.toggleSourceDateGutter",
-				"enablement": "code-for-ibmi:connected && code-for-ibmi:sourceDateMode === diff",
+				"enablement": "code-for-ibmi:connected",
 				"title": "Toggle Source Date Gutter",
 				"category": "IBM i"
 			},
 			{
 				"command": "code-for-ibmi.member.newDateSearch",
-				"enablement": "code-for-ibmi:connected && code-for-ibmi:sourceDateMode === diff",
+				"enablement": "code-for-ibmi:connected",
 				"title": "Apply Source Date Filter",
 				"category": "IBM i"
 			},

src/api/configuration/config/ConnectionManager.ts

@@ -27,7 +27,6 @@ function initialize(parameters: Partial<ConnectionConfig>): ConnectionConfig {
     autoConvertIFSccsid: (parameters.autoConvertIFSccsid === true),
     hideCompileErrors: parameters.hideCompileErrors || [],
     enableSourceDates: parameters.enableSourceDates === true,
-    sourceDateMode: parameters.sourceDateMode || "diff",
     sourceDateGutter: parameters.sourceDateGutter === true,
     encodingFor5250: parameters.encodingFor5250 || `default`,
     terminalFor5250: parameters.terminalFor5250 || `default`,

src/api/configuration/config/types.ts

@@ -1,7 +1,6 @@
 import { FilterType } from "../../Filter";
 import { DeploymentMethod, ConnectionData } from "../../types";
 
-export type SourceDateMode = "edit" | "diff";
 export type DefaultOpenMode = "browse" | "edit";
 export type ReconnectMode = "always" | "never" | "ask";
 
@@ -17,7 +16,6 @@ export interface ConnectionConfig extends ConnectionProfile {
   autoConvertIFSccsid: boolean;
   hideCompileErrors: string[];
   enableSourceDates: boolean;
-  sourceDateMode: SourceDateMode;
   sourceDateGutter: boolean;
   encodingFor5250: string;
   terminalFor5250: string;

src/commands/open.ts

@@ -423,7 +423,7 @@ export function registerOpenCommands(instance: Instance): Disposable[] {
           const editor = window.activeTextEditor;
           if (editor) {
             currentFile = editor.document.uri;
-            commands.executeCommand(`diff`, currentFile, path);
+            commands.executeCommand(`vscode.diff`, currentFile, path);
             quickPick.hide();
           }
         }

src/filesystems/qsys/QSysFs.ts

@@ -55,10 +55,6 @@ export class QSysFS implements vscode.FileSystemProvider {
         this.sourceDateHandler = new SourceDateHandler(context);
         this.extendedContent = new ExtendedIBMiContent(this.sourceDateHandler);
 
-        context.subscriptions.push(
-            onCodeForIBMiConfigurationChange(["connectionSettings", "showDateSearchButton"], () => this.updateMemberSupport()),
-        );
-
         instance.subscribe(
             context,
             'connected',
@@ -82,7 +78,6 @@ export class QSysFS implements vscode.FileSystemProvider {
         if (connection && config?.enableSourceDates) {
             if (connection.sqlRunnerAvailable()) {
                 this.extendedMemberSupport = true;
-                this.sourceDateHandler.changeSourceDateMode(config.sourceDateMode);
             } else {
                 vscode.window.showErrorMessage(`Source date support is enabled, but the remote system does not support SQL. Source date support will be disabled.`);
             }

src/filesystems/qsys/extendedContent.ts

@@ -60,9 +60,7 @@ export class ExtendedIBMiContent {
 
       this.sourceDateHandler.baseDates.set(alias, sourceDates);
 
-      if (this.sourceDateHandler.sourceDateMode === `diff`) {
-        this.sourceDateHandler.baseSource.set(alias, body);
-      }
+      this.sourceDateHandler.baseSource.set(alias, body);
 
       return body;
     }
@@ -112,21 +110,11 @@ export class ExtendedIBMiContent {
       const aliasPath = `${tempLib}.${alias}`;
 
       let sourceDates;
-      if (this.sourceDateHandler.sourceDateMode === `edit`) {
-        if (!this.sourceDateHandler.baseDates.get(alias)) {
-          await this.downloadMemberContentWithDates(uri);          
-          sourceDates = this.sourceDateHandler.calcNewSourceDates(alias, body);
-        }
-        else{
-          sourceDates = this.sourceDateHandler.baseDates.get(alias) || [];
-        }        
-      }
-      else {
-        if (!this.sourceDateHandler.baseSource.has(alias)) {
-          await this.downloadMemberContentWithDates(uri);
-        }
-        sourceDates = this.sourceDateHandler.calcNewSourceDates(alias, body);
+
+      if (!this.sourceDateHandler.baseSource.has(alias)) {
+        await this.downloadMemberContentWithDates(uri);
       }
+      sourceDates = this.sourceDateHandler.calcNewSourceDates(alias, body);
 
       const client = connection.client!;
 
@@ -192,10 +180,8 @@ export class ExtendedIBMiContent {
           throw new Error(`Failed to save member: ` + insertResult.stderr);
         }
 
-        if (this.sourceDateHandler.sourceDateMode === `diff`) {
-          this.sourceDateHandler.baseSource.set(alias, body);
-          this.sourceDateHandler.baseDates.set(alias, sourceDates);
-        }
+        this.sourceDateHandler.baseSource.set(alias, body);
+        this.sourceDateHandler.baseDates.set(alias, sourceDates);
       }
     }
   }