FileStatus (@NotNull VirtualFile virtualFile) { ChangelistConflictTracker conflictTracker = ChangelistConflictTracker.getInstance(myProject); ChangelistConflictTracker.Options options = conflictTracker.getOptions(); if (options.HIGHLIGHT_CONFLICTS && conflictTracker.hasConflict(virtualFile)) { return CHANGELIST_CONFLICT; } else if (options.HIGHLIGHT_NON_ACTIVE_CHANGELIST) { FileStatus status = ChangeListManager.getInstance(myProject).getStatus(virtualFile); if (status == FileStatus.MODIFIED || status == FileStatus.ADDED) { if (!conflictTracker.isFromActiveChangelist(virtualFile)) { return status == FileStatus.MODIFIED ? MODIFIED_OUTSIDE : ADDED_OUTSIDE; } } } return null; }