Merge pull request #465 from gjsjohnmurray/fix-464

fix #464 add objectscript.overwriteServerChanges setting

Author: gjsjohnmurray

package.json

@@ -833,6 +833,11 @@
           "default": "cuk",
           "description": "Compilation flags."
         },
+        "objectscript.overwriteServerChanges": {
+          "type": "boolean",
+          "default": false,
+          "description": "Overwrite a changed server version without confirmation when importing the local file."
+        },
         "objectscript.autoPreviewXML": {
           "type": "boolean",
           "default": false,

src/commands/compile.ts

@@ -69,7 +69,7 @@ async function importFile(file: CurrentFile, ignoreConflict?: boolean): Promise<
   const api = new AtelierAPI(file.uri);
   const content = file.content.split(/\r?\n/);
   const mtime = await checkChangedOnServer(file);
-  ignoreConflict = ignoreConflict || mtime < 0;
+  ignoreConflict = ignoreConflict || mtime < 0 || (file.uri.scheme === "file" && config("overwriteServerChanges"));
   return api
     .putDoc(
       file.name,