MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 05:51:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Version Control. Diff and Merge] IJPL-190273 Enable semantic merge API by default.

Browse Source 
GitOrigin-RevId: b8b402d0b9a33fa6e790f036199adf32db2d1767
This commit is contained in:
Georgii Ustinov
2025-06-03 11:42:58 +03:00
committed by intellij-monorepo-bot
parent 5a9a82ea25
commit ffa61130a0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/diff-impl/resources/META-INF/diff-impl.xml
View File

@@ -7,8 +7,8 @@
<registryKey key="diff.by.word.deprioritize.line.differences" defaultValue="false"
description="When possible, let 'changed words' have influence on 'changed lines'"/>
<registryKey key="semantic.merge.conflict.resolution" defaultValue="false" description="Try to resolve conflicts based on the semantics of the file"/>
<registryKey key="semantic.merge.recompute.after.change" defaultValue="false" description="Recompute semantic merge conflicting chunks result when document has changed"/>
<registryKey key="semantic.merge.conflict.resolution" defaultValue="true" description="Try to resolve conflicts based on the semantics of the file"/>
<registryKey key="semantic.merge.recompute.after.change" defaultValue="true" description="Recompute semantic merge conflicting chunks result when document has changed"/>
<registryKey key="diff.semantic.highlighting" defaultValue="false" description="Enables difference highlighting based on the semantics language"/>

5
platform/diff-impl/src/com/intellij/diff/merge/MergeThreesideViewer.java
View File

@@ -1014,7 +1014,10 @@ public class MergeThreesideViewer extends ThreesideTextDiffViewerEx {
@Override
protected void postInstallHighlighters() {
if (!Registry.is("semantic.merge.recompute.after.change", false) || myEditablePsiFile == null || myProject == null) return;
if (!Registry.is("semantic.merge.recompute.after.change", false) ||
myEditablePsiFile == null ||
myProject == null ||
!myConflictResolver.isAvailable()) return;
PsiDocumentManager.getInstance(myProject).commitDocument(myEditablePsiFile.getFileDocument());
List<PsiFile> fileList = List.of(ThreeSide.LEFT.select(myPsiFiles), myEditablePsiFile, ThreeSide.RIGHT.select(myPsiFiles));