Unnamed: 0 int64 0 305k | body stringlengths 7 52.9k | name stringlengths 1 185 |
|---|---|---|
257,700 | Action (@NotNull MergeResult result) { return switch (result) { case CANCEL -> myCancelResolveAction; case LEFT -> myLeftResolveAction; case RIGHT -> myRightResolveAction; case RESOLVED -> myAcceptResolveAction; }; } | getResolveAction |
257,701 | void () { Disposer.dispose(myViewer); } | dispose |
257,702 | MergeThreesideViewer () { return myViewer; } | getViewer |
257,703 | MergeThreesideViewer (@NotNull DiffContext context, @NotNull ContentDiffRequest request, @NotNull MergeContext mergeContext, @NotNull TextMergeRequest mergeRequest, @NotNull TextMergeViewer mergeViewer) { return new MergeThreesideViewer(context, request, mergeContext, mergeRequest, mergeViewer); } | loadThreeSideViewer |
257,704 | void () { if (myWrapper != null) return; myProcessor = createProcessor(); String dialogGroupKey = myProcessor.getContextUserData(DiffUserDataKeys.DIALOG_GROUP_KEY); if (dialogGroupKey == null) dialogGroupKey = "MergeDialog"; myWrapper = new WindowWrapperBuilder(DiffUtil.getWindowMode(myHints), new MyPanel(myProcessor.g... | init |
257,705 | void () { if (ApplicationManager.getApplication().isWriteAccessAllowed()) { LOG.error("Merge dialog should not be shown under a write action, as it will disable any background activity."); } init(); myWrapper.show(); } | show |
257,706 | MergeRequestProcessor () { return new MergeRequestProcessor(myProject) { @Override public void closeDialog() { myWrapper.close(); } @Override protected void setWindowTitle(@NotNull @NlsContexts.DialogTitle String title) { myWrapper.setTitle(title); } @Nullable @Override protected JRootPane getRootPane() { RootPaneConta... | createProcessor |
257,707 | void () { myWrapper.close(); } | closeDialog |
257,708 | void (@NotNull @NlsContexts.DialogTitle String title) { myWrapper.setTitle(title); } | setWindowTitle |
257,709 | JRootPane () { RootPaneContainer container = ObjectUtils.tryCast(myWrapper.getWindow(), RootPaneContainer.class); return container != null ? container.getRootPane() : null; } | getRootPane |
257,710 | Dimension () { Dimension windowSize = DiffUtil.getDefaultDiffWindowSize(); Dimension size = super.getPreferredSize(); return new Dimension(Math.max(windowSize.width, size.width), Math.max(windowSize.height, size.height)); } | getPreferredSize |
257,711 | void (@NotNull MergeRequestProcessor processor) { processor.init(myMergeRequest); } | initProcessor |
257,712 | void (@NotNull MergeRequestProcessor processor) { processor.init(myMergeRequestProducer); } | initProcessor |
257,713 | MergeViewer (@NotNull MergeContext context, @NotNull MergeRequest request) { return new BinaryMergeViewer(context, (ThreesideMergeRequest)request); } | createComponent |
257,714 | boolean (@NotNull MergeContext context, @NotNull MergeRequest request) { if (!(request instanceof ThreesideMergeRequest)) return false; MergeUtil.ProxyDiffContext diffContext = new MergeUtil.ProxyDiffContext(context); for (DiffContent diffContent : ((ThreesideMergeRequest)request).getContents()) { if (!BinaryEditorHold... | canShow |
257,715 | List<DiffContent> (@NotNull ThreesideMergeRequest mergeRequest) { return new ArrayList<>(mergeRequest.getContents()); } | getDiffContents |
257,716 | List<String> (@NotNull ThreesideMergeRequest mergeRequest) { return MergeUtil.notNullizeContentTitles(mergeRequest.getContentTitles()); } | getDiffContentTitles |
257,717 | JComponent () { return myViewer.getComponent(); } | getComponent |
257,718 | JComponent () { return myViewer.getPreferredFocusedComponent(); } | getPreferredFocusedComponent |
257,719 | ToolbarComponents () { ToolbarComponents components = new ToolbarComponents(); FrameDiffTool.ToolbarComponents init = myViewer.init(); components.statusPanel = init.statusPanel; components.toolbarActions = init.toolbarActions; components.closeHandler = () -> MergeUtil.showExitWithoutApplyingChangesDialog(this, myMergeR... | init |
257,720 | Action (@NotNull final MergeResult result) { if (result == MergeResult.RESOLVED) return null; return MergeUtil.createSimpleResolveAction(result, myMergeRequest, myMergeContext, this, false); } | getResolveAction |
257,721 | void () { Disposer.dispose(myViewer); } | dispose |
257,722 | MyThreesideViewer () { return myViewer; } | getViewer |
257,723 | void (boolean trySync) { } | rediff |
257,724 | Action (@NotNull MergeResult result, @NotNull MergeRequest request, @NotNull MergeContext context, @NotNull MergeViewer viewer, boolean contentWasModified) { String caption = getResolveActionTitle(result, request, context); return new AbstractAction(caption) { @Override public void actionPerformed(ActionEvent e) { if (... | createSimpleResolveAction |
257,725 | void (ActionEvent e) { if (result == MergeResult.CANCEL && !showExitWithoutApplyingChangesDialog(viewer, request, context, contentWasModified)) { return; } context.finishMerge(result); } | actionPerformed |
257,726 | String (@NotNull MergeResult result, @Nullable MergeRequest request, @Nullable MergeContext context) { Function<MergeResult, @Nls String> getter = DiffUtil.getUserData(request, context, DiffUserDataKeysEx.MERGE_ACTION_CAPTIONS); String message = getter != null ? getter.fun(result) : null; if (message != null) return me... | getResolveActionTitle |
257,727 | List<String> (@NotNull List<String> mergeContentTitles) { String left = StringUtil.notNullize(ThreeSide.LEFT.select(mergeContentTitles), DiffBundle.message("merge.version.title.our")); String base = StringUtil.notNullize(ThreeSide.BASE.select(mergeContentTitles), DiffBundle.message("merge.version.title.base")); String ... | notNullizeContentTitles |
257,728 | Project () { return myMergeContext.getProject(); } | getProject |
257,729 | boolean () { return true; } | isWindowFocused |
257,730 | boolean () { return myMergeContext.isFocusedInWindow(); } | isFocusedInWindow |
257,731 | void () { myMergeContext.requestFocusInWindow(); } | requestFocusInWindow |
257,732 | boolean (@NotNull MergeViewer viewer, @NotNull MergeRequest request, @NotNull MergeContext context, boolean contentWasModified) { Condition<MergeViewer> customHandler = DiffUtil.getUserData(request, context, DiffUserDataKeysEx.MERGE_CANCEL_HANDLER); if (customHandler != null) { return customHandler.value(viewer); } ret... | showExitWithoutApplyingChangesDialog |
257,733 | boolean (@NotNull JComponent component, @NotNull MergeRequest request, @NotNull MergeContext context) { Couple<@Nls String> customMessage = DiffUtil.getUserData(request, context, DiffUserDataKeysEx.MERGE_CANCEL_MESSAGE); if (customMessage != null) { String title = customMessage.first; String message = customMessage.sec... | showExitWithoutApplyingChangesDialog |
257,734 | boolean (@NotNull JComponent parent, @NotNull @Nls String actionName, boolean contentWasModified) { if (!contentWasModified) { return true; } return MessageDialogBuilder .yesNo(actionName, DiffBundle.message("label.merge.unsaved.changes.discard.and.do.anyway", actionName.toLowerCase(DynamicBundle.getLocale()))) .yesTex... | showConfirmDiscardChangesDialog |
257,735 | boolean (@NotNull MergeRequest request) { MergeCallback callback = MergeCallback.getCallback(request); if (callback.checkIsValid()) { return true; } return MessageDialogBuilder .yesNo(DiffBundle.message("cancel.visual.merge.dialog.title"), DiffBundle.message("merge.conflict.is.outdated")) .yesText(CommonBundle.message(... | shouldRestoreOriginalContentOnCancel |
257,736 | void (@Nullable Project project, @Nullable VirtualFile file) { if (project != null && file != null && isProjectFile(file)) { StoreReloadManager.Companion.getInstance(project).saveChangedProjectFile(file); } } | reportProjectFileChangeIfNeeded |
257,737 | boolean (@NotNull VirtualFile file) { if (file.isDirectory()) return false; if (isProjectOrWorkspaceFile(file)) return true; ProjectOpenProcessor importProvider = ProjectOpenProcessor.getImportProvider(file); return importProvider != null && importProvider.lookForProjectsInDirectory(); } | isProjectFile |
257,738 | JComponent () { return myPanel; } | getComponent |
257,739 | JComponent () { return null; } | getPreferredFocusedComponent |
257,740 | Action (@NotNull final MergeResult result) { if (result != MergeResult.CANCEL) return null; String caption = MergeUtil.getResolveActionTitle(result, null, myMergeContext); return new AbstractAction(caption) { @Override public void actionPerformed(ActionEvent e) { myMergeContext.finishMerge(result); } }; } | getResolveAction |
257,741 | void (ActionEvent e) { myMergeContext.finishMerge(result); } | actionPerformed |
257,742 | void () { } | dispose |
257,743 | void () { destroyHighlighters(); installHighlighters(); destroyOperations(); installOperations(); myViewer.repaintDividers(); } | reinstallHighlighters |
257,744 | int () { return myIndex; } | getIndex |
257,745 | void (@NotNull Side side, boolean value) { myResolved[side.getIndex()] = value; if (isResolved()) { destroyInnerHighlighters(); } else { // Destroy only resolved side to reduce blinking Document document = myViewer.getEditor(side.select(ThreeSide.LEFT, ThreeSide.RIGHT)).getDocument(); for (RangeHighlighter highlighter ... | setResolved |
257,746 | boolean () { return myResolved[0] && myResolved[1]; } | isResolved |
257,747 | boolean (@NotNull Side side) { return side.select(myResolved); } | isResolved |
257,748 | boolean () { return myOnesideAppliedConflict; } | isOnesideAppliedConflict |
257,749 | void () { myOnesideAppliedConflict = true; } | markOnesideAppliedConflict |
257,750 | boolean (@NotNull ThreeSide side) { return switch (side) { case LEFT -> isResolved(Side.LEFT); case BASE -> isResolved(); case RIGHT -> isResolved(Side.RIGHT); }; } | isResolved |
257,751 | int () { return myViewer.getModel().getLineStart(myIndex); } | getStartLine |
257,752 | int () { return myViewer.getModel().getLineEnd(myIndex); } | getEndLine |
257,753 | int (@NotNull ThreeSide side) { if (side == ThreeSide.BASE) return getStartLine(); return myFragment.getStartLine(side); } | getStartLine |
257,754 | int (@NotNull ThreeSide side) { if (side == ThreeSide.BASE) return getEndLine(); return myFragment.getEndLine(side); } | getEndLine |
257,755 | Editor (@NotNull ThreeSide side) { return myViewer.getEditor(side); } | getEditor |
257,756 | MergeInnerDifferences () { return myInnerFragments; } | getInnerFragments |
257,757 | MergeLineFragment () { return myFragment; } | getFragment |
257,758 | void (@Nullable MergeInnerDifferences innerFragments) { if (myInnerFragments == null && innerFragments == null) return; myInnerFragments = innerFragments; reinstallHighlighters(); destroyInnerHighlighters(); installInnerHighlighters(); } | setInnerFragments |
257,759 | void () { ContainerUtil.addIfNotNull(myOperations, createResolveOperation()); ContainerUtil.addIfNotNull(myOperations, createAcceptOperation(Side.LEFT, OperationType.APPLY)); ContainerUtil.addIfNotNull(myOperations, createAcceptOperation(Side.LEFT, OperationType.IGNORE)); ContainerUtil.addIfNotNull(myOperations, create... | installOperations |
257,760 | DiffGutterOperation (@NotNull ThreeSide side, @NotNull DiffGutterOperation.ModifiersRendererBuilder builder) { if (isResolved(side)) return null; EditorEx editor = myViewer.getEditor(side); int offset = DiffGutterOperation.lineToOffset(editor, getStartLine(side)); return new DiffGutterOperation.WithModifiers(editor, of... | createOperation |
257,761 | DiffGutterOperation () { return createOperation(ThreeSide.BASE, (ctrlPressed, shiftPressed, altPressed) -> { return createResolveRenderer(); }); } | createResolveOperation |
257,762 | DiffGutterOperation (@NotNull Side versionSide, @NotNull OperationType type) { ThreeSide side = versionSide.select(ThreeSide.LEFT, ThreeSide.RIGHT); return createOperation(side, (ctrlPressed, shiftPressed, altPressed) -> { if (!isChange(versionSide)) return null; if (type == OperationType.APPLY) { return createApplyRen... | createAcceptOperation |
257,763 | GutterIconRenderer (@NotNull final Side side, final boolean modifier) { if (isResolved(side)) return null; Icon icon = isOnesideAppliedConflict() ? DiffUtil.getArrowDownIcon(side) : DiffUtil.getArrowIcon(side); return createIconRenderer(DiffBundle.message("action.presentation.diff.accept.text"), icon, isConflict(), () ... | createApplyRenderer |
257,764 | GutterIconRenderer (@NotNull final Side side, final boolean modifier) { if (isResolved(side)) return null; return createIconRenderer(DiffBundle.message("action.presentation.merge.ignore.text"), AllIcons.Diff.Remove, isConflict(), () -> { myViewer.executeMergeCommand(DiffBundle.message("merge.dialog.ignore.change.comman... | createIgnoreRenderer |
257,765 | GutterIconRenderer () { if (!this.isConflict() || !myViewer.canResolveChangeAutomatically(this, ThreeSide.BASE)) return null; return createIconRenderer(DiffBundle.message("action.presentation.merge.resolve.text"), AllIcons.Diff.MagicResolve, false, () -> { myViewer.executeMergeCommand(DiffBundle.message("merge.dialog.r... | createResolveRenderer |
257,766 | GutterIconRenderer (@NotNull final @NlsContexts.Tooltip String text, @NotNull final Icon icon, boolean ctrlClickVisible, @NotNull final Runnable perform) { @Nls String appendix = ctrlClickVisible ? DiffBundle.message("tooltip.merge.ctrl.click.to.resolve.conflict") : null; final String tooltipText = DiffUtil.createToolt... | createIconRenderer |
257,767 | void () { perform.run(); } | handleMouseClick |
257,768 | State () { return new State( myIndex, getStartLine(), getEndLine(), myResolved[0], myResolved[1], myOnesideAppliedConflict); } | storeState |
257,769 | void (@NotNull State state) { myResolved[0] = state.myResolved1; myResolved[1] = state.myResolved2; myOnesideAppliedConflict = state.myOnesideAppliedConflict; } | restoreState |
257,770 | void (@NotNull MergeRequest request) { setTitle(request.getTitle()); myRequest = request; onAssigned(myRequest, true); myViewer = createViewerFor(request); initViewer(); installCallbackListener(myRequest); } | init |
257,771 | void (@NotNull MergeRequestProducer request) { setTitle(request.getName()); initViewer(); ModalityState modality = ModalityState.stateForComponent(myPanel); BackgroundTaskUtil.executeOnPooledThread(this, () -> { try { MergeRequest mergeRequest = request.process(myContext, ProgressManager.getInstance().getProgressIndica... | init |
257,772 | void () { myContentPanel.setContent(myViewer.getComponent()); MergeTool.ToolbarComponents toolbarComponents = myViewer.init(); buildToolbar(toolbarComponents.toolbarActions); myToolbarStatusPanel.setContent(toolbarComponents.statusPanel); myCloseHandler = toolbarComponents.closeHandler; updateBottomActions(); } | initViewer |
257,773 | void () { Disposer.dispose(myViewer); ActionUtil.clearActions(myMainPanel); myContentPanel.setContent(null); myToolbarPanel.setContent(null); myToolbarStatusPanel.setContent(null); myButtonsPanel.setContent(null); myCloseHandler = null; } | destroyViewer |
257,774 | void () { Action applyLeft = myViewer.getResolveAction(MergeResult.LEFT); Action applyRight = myViewer.getResolveAction(MergeResult.RIGHT); Action resolveAction = myViewer.getResolveAction(MergeResult.RESOLVED); Action cancelAction = myViewer.getResolveAction(MergeResult.CANCEL); if (resolveAction != null) { resolveAct... | updateBottomActions |
257,775 | void (@NotNull AnActionEvent e) { resolveAction.actionPerformed(null); } | actionPerformed |
257,776 | JPanel (@NotNull List<? extends Action> actions, @Nullable JRootPane rootPane) { List<JButton> buttons = ContainerUtil.map(actions, action -> DialogWrapper.createJButtonForAction(action, rootPane)); return DialogWrapper.layoutButtonsPanel(buttons); } | createButtonsPanel |
257,777 | DefaultActionGroup (@Nullable List<? extends AnAction> viewerActions) { DefaultActionGroup group = new DefaultActionGroup(); List<AnAction> navigationActions = Arrays.asList(new MyPrevDifferenceAction(), new MyNextDifferenceAction()); DiffUtil.addActionBlock(group, navigationActions); DiffUtil.addActionBlock(group, vie... | collectToolbarActions |
257,778 | void (@Nullable List<? extends AnAction> viewerActions) { ActionGroup group = collectToolbarActions(viewerActions); ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.DIFF_TOOLBAR, group, true); toolbar.setShowSeparatorTitles(true); DataManager.registerDataProvider(toolbar.getComponent... | buildToolbar |
257,779 | MergeTool (@NotNull MergeRequest request) { for (MergeTool tool : myAvailableTools) { try { if (tool.canShow(myContext, request)) return tool; } catch (Throwable e) { LOG.error(e); } } return ErrorMergeTool.INSTANCE; } | getFittedTool |
257,780 | void (@Nullable String title) { if (title == null) title = DiffBundle.message("merge.files.dialog.title"); setWindowTitle(title); } | setTitle |
257,781 | void (@NotNull MergeRequest request) { MergeCallback callback = MergeCallback.getCallback(request); callback.addListener(new MergeCallback.Listener() { @Override public void fireConflictInvalid() { showInvalidRequestNotification(); } }, this); if (!callback.checkIsValid()) { showInvalidRequestNotification(); } } | installCallbackListener |
257,782 | void () { showInvalidRequestNotification(); } | fireConflictInvalid |
257,783 | void () { ApplicationManager.getApplication().invokeLater(() -> { if (myDisposed) return; if (!myNotificationPanel.isNull()) return; EditorNotificationPanel notification = new EditorNotificationPanel(LightColors.RED, EditorNotificationPanel.Status.Error); notification.setText(DiffBundle.message("error.conflict.is.not.v... | showInvalidRequestNotification |
257,784 | void () { if (myDisposed) return; UIUtil.invokeLaterIfNeeded(() -> { if (myDisposed) return; myDisposed = true; onDispose(); destroyViewer(); applyRequestResult(MergeResult.CANCEL); if (myRequest != null) { onAssigned(myRequest, false); } }); } | dispose |
257,785 | void (@NotNull MergeResult result) { if (myConflictResolved || myRequest == null) return; myConflictResolved = true; try { myRequest.applyResult(result); } catch (Exception e) { LOG.warn(e); new Notification("Merge Internal Error", DiffBundle.message("can.t.finish.merge.resolve"), e.getMessage(), NotificationType.ERROR... | applyRequestResult |
257,786 | void (@NotNull MergeTool tool) { if (myRequest == null) return; if (myConflictResolved) { LOG.warn("Can't reopen with " + tool + " - conflict already resolved"); return; } if (!tool.canShow(myContext, myRequest)) { LOG.warn("Can't reopen with " + tool + " - " + myRequest); return; } MergeTool.MergeViewer newViewer; try... | reopenWithTool |
257,787 | void (@NotNull MergeTool.MergeViewer newViewer) { DiffUtil.runPreservingFocus(myContext, () -> { destroyViewer(); myViewer = newViewer; initViewer(); }); } | swapViewer |
257,788 | void (@NotNull MergeRequest request, boolean isAssigned) { try { request.onAssigned(isAssigned); } catch (Exception e) { LOG.error(e); } } | onAssigned |
257,789 | void () { } | onDispose |
257,790 | void (@NotNull String title) { } | setWindowTitle |
257,791 | JComponent () { return myPanel; } | getComponent |
257,792 | JComponent () { JComponent component = myViewer.getPreferredFocusedComponent(); return component != null ? component : myToolbarPanel.getTargetComponent(); } | getPreferredFocusedComponent |
257,793 | Project () { return myProject; } | getProject |
257,794 | MergeContext () { return myContext; } | getContext |
257,795 | boolean () { return myConflictResolved || myCloseHandler == null || myCloseHandler.get(); } | checkCloseAction |
257,796 | boolean () { return DiffUtil.isFocusedComponentInWindow(myPanel); } | isFocusedInWindow |
257,797 | void () { DiffUtil.requestFocusInWindow(getPreferredFocusedComponent()); } | requestFocusInWindow |
257,798 | ActionUpdateThread () { return ActionUpdateThread.EDT; } | getActionUpdateThread |
257,799 | void (@NotNull AnActionEvent e) { if (!ActionPlaces.DIFF_TOOLBAR.equals(e.getPlace())) { e.getPresentation().setEnabled(true); return; } PrevNextDifferenceIterable iterable = e.getData(DiffDataKeys.PREV_NEXT_DIFFERENCE_ITERABLE); if (iterable != null && iterable.canGoNext()) { e.getPresentation().setEnabled(true); retu... | update |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.