Deduplicate exposed API

Author: mclaughlinconnor

demo/index.html

@@ -238,16 +238,16 @@
         return API.greedyMerge(left, middle, right);
       }
 
-      function diff(left, middle, right) {
-        return API.diff(left, middle, right);
+      function diff(left, middle, right, patience) {
+        return API.resolve(left, middle, right, false, false, patience);
       }
 
-      function resolveNonConflicting(left, middle, right) {
-        return API.resolveNonConflicting(left, middle, right);
+      function resolveNonConflicting(left, middle, right, greedy, patience) {
+        return API.resolve(left, middle, right, true, greedy, patience, false);
       }
 
-      function applyResolvableConflictedChanges(left, middle, right) {
-        return API.applyResolvableConflictedChanges(left, middle, right);
+      function applyResolvableConflictedChanges(left, middle, right, greedy, patience) {
+        return API.resolve(left, middle, right, true, greedy, patience, true);
       }
 
       function getIjText() {
@@ -265,32 +265,32 @@
       }
 
       function clearResults() {
-        setResults(["", "", ""])
+        setResults(["", "", ""]);
       }
 
-      function doDiff() {
+      function doDiff(patience = false) {
         const [left, middle, right] = getIjText();
 
         clearResults()
-        const results = diff(left, middle, right);
+        const results = diff(left, middle, right, patience);
         setResults(results);
         API.decorate();
       }
 
-      function doResolveNonConflicting() {
+      function doResolveNonConflicting(greedy = false, patience = false) {
         const [left, middle, right] = getIjText();
 
         clearResults()
-        const results = resolveNonConflicting(left, middle, right);
+        const results = resolveNonConflicting(left, middle, right, greedy, patience);
         setResults(results);
         API.decorate();
       }
 
-      function doApplyResolvableConflictedChanges() {
+      function doApplyResolvableConflictedChanges(greedy = false, patience = false) {
         const [left, middle, right] = getIjText();
 
         clearResults()
-        const results = applyResolvableConflictedChanges(left, middle, right);
+        const results = applyResolvableConflictedChanges(left, middle, right, greedy, patience);
         setResults(results);
         API.decorate();
       }
@@ -352,8 +352,15 @@ <h2>IJ Merge</h2>
 
     <div class="action-buttons">
       <button onclick="doDiff()">Render diff</button>
+      <button onclick="doDiff(true)">Render diff (patience)</button>
       <button onclick="doResolveNonConflicting()">Resolve non-conflicting changes</button>
-      <button onclick="doApplyResolvableConflictedChanges()">Apply resolvable conflicted changes</button>
+      <button onclick="doResolveNonConflicting(true)">Resolve non-conflicting changes (greedy)</button>
+      <button onclick="doResolveNonConflicting(false, true)">Resolve non-conflicting changes (patience)</button>
+      <button onclick="doResolveNonConflicting(true, true)">Resolve non-conflicting changes (greedy, patience)</button>
+      <button onclick="doApplyResolvableConflictedChanges()">Apply resolvable conflicted changes ()</button>
+      <button onclick="doApplyResolvableConflictedChanges(true)">Apply resolvable conflicted changes (greedy)</button>
+      <button onclick="doApplyResolvableConflictedChanges(false, true)">Apply resolvable conflicted changes (patience)</button>
+      <button onclick="doApplyResolvableConflictedChanges(true, true)">Apply resolvable conflicted changes (greedy, patience)</button>
     </div>
 </body>
 </html>

src/Main.hx

@@ -11,44 +11,17 @@ class Main {
 
 @:expose
 class API {
+	static public function resolve(left, middle, right, applyNonConflicted = false, greedy = false, patience = false, conflicts = false):Array<String> {
+		DiffConfig.AUTO_APPLY_NON_CONFLICTED_CHANGES = applyNonConflicted;
+		DiffConfig.USE_GREEDY_MERGE_MAGIC_RESOLVE = greedy;
+		DiffConfig.USE_PATIENCE_ALG = patience;
 
-
-	static public function applyResolvableConflictedChanges(left, middle, right):Array<String> {
 		var viewer = new MergeThreesideViewer([left, middle, right], middle);
 		viewer.rediff(false);
-		viewer.applyResolvableConflictedChanges();
-
-		var finalMergedText = viewer.myModel.getDocument();
-
-		var diff = new Diff(viewer.myAllMergeChanges);
 
-		var formattedLeft = diff.formatSide(left, ThreeSideEnum.LEFT);
-		var formattedMiddle = diff.formatSide(finalMergedText, ThreeSideEnum.BASE);
-		var formattedRight = diff.formatSide(right, ThreeSideEnum.RIGHT);
-
-		return [finalMergedText, formattedLeft, formattedMiddle, formattedRight];
-	}
-
-	static public function diff(left, middle, right):Array<String> {
-		DiffConfig.AUTO_APPLY_NON_CONFLICTED_CHANGES = false;
-		var viewer = new MergeThreesideViewer([left, middle, right], middle);
-		viewer.rediff(false);
-
-		var finalMergedText = viewer.myModel.getDocument();
-
-		var diff = new Diff(viewer.myAllMergeChanges);
-
-		var formattedLeft = diff.formatSide(left, ThreeSideEnum.LEFT);
-		var formattedMiddle = diff.formatSide(finalMergedText, ThreeSideEnum.BASE);
-		var formattedRight = diff.formatSide(right, ThreeSideEnum.RIGHT);
-
-		return [finalMergedText, formattedLeft, formattedMiddle, formattedRight];
-	}
-
-	static public function resolveNonConflicting(left, middle, right):Array<String> {
-		DiffConfig.AUTO_APPLY_NON_CONFLICTED_CHANGES = true;
-		var viewer = new MergeThreesideViewer([left, middle, right], middle);
-		viewer.rediff(false);
+		if (conflicts) {
+			viewer.applyResolvableConflictedChanges();
+		}
 
 		var finalMergedText = viewer.myModel.getDocument();
 
@@ -75,8 +48,8 @@ class API {
 	}
 
 	#if js
-	static public function decorate():Void{
-    DiffDecorations.decorate();
-  }
+	static public function decorate():Void {
+		DiffDecorations.decorate();
+	}
 	#end
 }