void (@NotNull VirtualFile file, @NotNull LocalChangeList defaultList) { if (!shouldDetectConflictsFor(file)) return; LocalChangeList changeList = myChangeListManager.getChangeList(file); if (changeList == null || Comparing.equal(changeList, defaultList)) { return; } String path = file.getPath(); boolean newConflict = false; synchronized (myConflicts) { Conflict conflict = myConflicts.get(path); if (conflict == null) { conflict = new Conflict(); myConflicts.put(path, conflict); newConflict = true; } } if (newConflict && myOptions.HIGHLIGHT_CONFLICTS) { FileStatusManager.getInstance(myProject).fileStatusChanged(file); EditorNotifications.getInstance(myProject).updateNotifications(file); } }