| Chunk |
|---|
| Conflicting content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.TextEditingTargetRMarkdownHelper; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionManager; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionRequest; <<<<<<< HEAD import org.rstudio.studio.client.workbench.views.source.editors.text.r.SignatureToolTipManager; ======= import org.rstudio.studio.client.workbench.views.source.editors.text.r.RCompletionToolTip; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook; >>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22 import org.rstudio.studio.client.workbench.views.vcs.svn.SVNCommandHandler; import org.rstudio.studio.client.workbench.views.environment.ClearAllDialog; import org.rstudio.studio.client.workbench.views.environment.dataimport.DataImport; |
| Solution content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.TextEditingTargetRMarkdownHelper; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionManager; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionRequest; import org.rstudio.studio.client.workbench.views.source.editors.text.r.SignatureToolTipManager; import org.rstudio.studio.client.workbench.views.source.editors.text.r.RCompletionToolTip; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel; import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook; import org.rstudio.studio.client.workbench.views.vcs.svn.SVNCommandHandler; import org.rstudio.studio.client.workbench.views.environment.ClearAllDialog; import org.rstudio.studio.client.workbench.views.environment.dataimport.DataImport; |
| File |
|---|
| RStudioGinjector.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
rnwContext_ = rnwContext;
docDisplay_ = docDisplay;
isConsole_ = isConsole;
<<<<<<< HEAD
sigTipManager_ = new SignatureToolTipManager(docDisplay_);
suggestTimer_ = new SuggestionTimer();
=======
sigTip_ = new RCompletionToolTip(docDisplay_);
suggestTimer_ = new SuggestionTimer(this, uiPrefs_);
>>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22
snippets_ = new SnippetHelper((AceEditor) docDisplay, getSourceDocumentPath());
requester_ = new CompletionRequester(rnwContext, navigableSourceEditor, snippets_);
|
| Solution content |
|---|
rnwContext_ = rnwContext;
docDisplay_ = docDisplay;
isConsole_ = isConsole;
sigTipManager_ = new SignatureToolTipManager(docDisplay_);
suggestTimer_ = new SuggestionTimer(this, uiPrefs_);
snippets_ = new SnippetHelper((AceEditor) docDisplay, getSourceDocumentPath());
requester_ = new CompletionRequester(rnwContext, navigableSourceEditor, snippets_);
|
| File |
|---|
| RCompletionManager.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
renderer.screenToTextCoordinates(rectangle.getLeft(), rectangle.getTop()),
renderer.screenToTextCoordinates(rectangle.getRight(), rectangle.getBottom()));
}
<<<<<<< HEAD
@Override
public Rectangle getPositionBounds(Position position)
=======
public Rectangle getPositionBounds(InputEditorPosition position)
>>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22
{
Renderer renderer = widget_.getEditor().getRenderer();
ScreenCoordinates start = renderer.textToScreenCoordinates( |
| Solution content |
|---|
renderer.screenToTextCoordinates(rectangle.getLeft(), rectangle.getTop()),
renderer.screenToTextCoordinates(rectangle.getRight(), rectangle.getBottom()));
}
@Override
public Rectangle getPositionBounds(Position position)
{
Renderer renderer = widget_.getEditor().getRenderer();
ScreenCoordinates start = renderer.textToScreenCoordinates( |
| File |
|---|
| AceEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
*/ package org.rstudio.studio.client.workbench.views.source.editors.text; <<<<<<< HEAD import org.rstudio.core.client.Rectangle; ======= import java.util.List; import org.rstudio.core.client.command.KeyboardShortcut.KeySequence; import org.rstudio.core.client.js.JsMap; >>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22 import org.rstudio.studio.client.common.debugging.model.Breakpoint; import org.rstudio.studio.client.common.filetypes.TextFileType; import org.rstudio.studio.client.server.Void; |
| Solution content |
|---|
*/ package org.rstudio.studio.client.workbench.views.source.editors.text; import org.rstudio.core.client.Rectangle; import java.util.List; import org.rstudio.core.client.command.KeyboardShortcut.KeySequence; import org.rstudio.core.client.js.JsMap; import org.rstudio.studio.client.common.debugging.model.Breakpoint; import org.rstudio.studio.client.common.filetypes.TextFileType; import org.rstudio.studio.client.server.Void; |
| File |
|---|
| DocDisplay.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Mode.InsertChunkInfo; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Position; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Range; <<<<<<< HEAD import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Renderer.ScreenCoordinates; ======= import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Selection; >>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22 import org.rstudio.studio.client.workbench.views.source.editors.text.ace.spelling.CharClassifier; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.spelling.TokenPredicate; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionContext; |
| Solution content |
|---|
import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Mode.InsertChunkInfo; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Position; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Range; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Renderer.ScreenCoordinates; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.Selection; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.spelling.CharClassifier; import org.rstudio.studio.client.workbench.views.source.editors.text.ace.spelling.TokenPredicate; import org.rstudio.studio.client.workbench.views.source.editors.text.cpp.CppCompletionContext; |
| File |
|---|
| DocDisplay.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
return value === "$" || value === "@" || value === "?" || value === "~";
}-*/;
<<<<<<< HEAD
public final boolean moveToActiveFunction()
{
TokenCursor clone = cloneCursor();
if (clone.moveToNextToken() && clone.currentValue().equals("("))
return true;
clone = cloneCursor();
if (TokenUtils.isRightBracket(clone))
{
if (!clone.bwdToMatchingToken())
return false;
if (!clone.moveToPreviousToken())
return false;
}
if (!clone.findOpeningBracket("(", true))
return false;
if (!clone.moveToPreviousToken())
return false;
setRow(clone.getRow());
setOffset(clone.getOffset());
return true;
=======
public final boolean isWithinFunctionCall()
{
TokenCursor clone = cloneCursor();
do
{
if (clone.peekBwd(1).isValidForFunctionCall())
return true;
if (!clone.moveToPreviousToken())
return false;
} while (clone.findOpeningBracket("(", false));
return false;
>>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22
}
} |
| Solution content |
|---|
public final boolean isWithinFunctionCall()
{
return value === "$" || value === "@" || value === "?" || value === "~";
}-*/;
public final boolean moveToActiveFunction()
{
TokenCursor clone = cloneCursor();
if (clone.moveToNextToken() && clone.currentValue().equals("("))
return true;
clone = cloneCursor();
if (TokenUtils.isRightBracket(clone))
{
if (!clone.bwdToMatchingToken())
return false;
if (!clone.moveToPreviousToken())
return false;
}
if (!clone.findOpeningBracket("(", true))
return false;
if (!clone.moveToPreviousToken())
return false;
setRow(clone.getRow());
setOffset(clone.getOffset());
return true;
}
TokenCursor clone = cloneCursor();
do
{
if (clone.peekBwd(1).isValidForFunctionCall())
return true;
if (!clone.moveToPreviousToken())
return false;
} while (clone.findOpeningBracket("(", false));
return false;
}
} |
| File |
|---|
| TokenCursor.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Do statement |
| If statement |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
// set the max width
setMaxWidth(Window.getClientWidth() - 200);
<<<<<<< HEAD
=======
getElement().getStyle().setZIndex(10000);
>>>>>>> 53e10c4f0f5a8b04ef1d80073f769cf69f948c22
}
public boolean previewKeyDown(NativeEvent event) |
| Solution content |
|---|
// set the max width
setMaxWidth(Window.getClientWidth() - 200);
<<<<<<< HEAD
=======
getElement().getStyle().setZIndex(10000);
>>>>>>> origin/master
}
public boolean previewKeyDown(NativeEvent event) |
| File |
|---|
| RCompletionToolTip.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |