mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 03:28:20 +02:00
Brian Fiete
GitHub
commit
ba4d29d28d
9 changed files with 1786 additions and 531 deletions
|
|
@ -243,9 +243,9 @@ namespace Beefy.theme.dark
|
|||
return mLineCoords[anchorLine + 1] == mLineCoords[checkLine + 1];
|
||||
}
|
||||
|
||||
protected override void AdjustCursorsAfterExternalEdit(int index, int ofs)
|
||||
protected override void AdjustCursorsAfterExternalEdit(int index, int ofs, int lineOfs)
|
||||
{
|
||||
base.AdjustCursorsAfterExternalEdit(index, ofs);
|
||||
base.AdjustCursorsAfterExternalEdit(index, ofs, lineOfs);
|
||||
mWantsCheckScrollPosition = true;
|
||||
}
|
||||
|
||||
|
|
@ -775,6 +775,96 @@ namespace Beefy.theme.dark
|
|||
}
|
||||
}
|
||||
|
||||
if (mEditWidget.mHasFocus)
|
||||
{
|
||||
void DrawSelection(int line, int startColumn, int endColumn)
|
||||
{
|
||||
float x = startColumn * mCharWidth;
|
||||
float y = mLineCoords[line];
|
||||
float width = Math.Abs(startColumn - endColumn) * mCharWidth;
|
||||
float height = mLineCoords[line + 1] - y;
|
||||
|
||||
using (g.PushColor(mHiliteColor))
|
||||
g.FillRect(x, y, width, height);
|
||||
}
|
||||
|
||||
void DrawSelection()
|
||||
{
|
||||
if (!HasSelection())
|
||||
return;
|
||||
|
||||
mSelection.Value.GetAsForwardSelect(var startPos, var endPos);
|
||||
GetLineColumnAtIdx(startPos, var startLine, var startColumn);
|
||||
GetLineColumnAtIdx(endPos, var endLine, var endColumn);
|
||||
|
||||
// Selection is on the single line
|
||||
if (startLine == endLine)
|
||||
{
|
||||
DrawSelection(startLine, startColumn, endColumn);
|
||||
return;
|
||||
}
|
||||
|
||||
// Selection goes across multiple lines
|
||||
|
||||
// First line
|
||||
GetLinePosition(startLine, ?, var firstLineEndIdx);
|
||||
GetLineColumnAtIdx(firstLineEndIdx, ?, var firstLineEndColumn);
|
||||
DrawSelection(startLine, startColumn, firstLineEndColumn + 1);
|
||||
|
||||
for (var lineIdx = startLine + 1; lineIdx < endLine; lineIdx++)
|
||||
{
|
||||
GetLinePosition(lineIdx, var lineStart, var lineEnd);
|
||||
GetLineColumnAtIdx(lineEnd, var line, var column);
|
||||
|
||||
if (column == 0)
|
||||
{
|
||||
// Blank line selected
|
||||
var y = mLineCoords[line];
|
||||
var height = mLineCoords[line + 1] - y;
|
||||
|
||||
using (g.PushColor(mHiliteColor))
|
||||
g.FillRect(0, y, 4, height);
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawSelection(line, 0, column + 1);
|
||||
}
|
||||
}
|
||||
|
||||
// Last line
|
||||
DrawSelection(endLine, 0, endColumn);
|
||||
}
|
||||
|
||||
var prevTextCursor = mCurrentTextCursor;
|
||||
for (var cursor in mTextCursors)
|
||||
{
|
||||
if (cursor.mId == 0)
|
||||
continue;
|
||||
|
||||
SetTextCursor(cursor);
|
||||
DrawSelection();
|
||||
|
||||
float x = 0;
|
||||
float y = 0;
|
||||
if (cursor.mVirtualCursorPos.HasValue)
|
||||
{
|
||||
x = cursor.mVirtualCursorPos.Value.mColumn * mCharWidth;
|
||||
y = mLineCoords[cursor.mVirtualCursorPos.Value.mLine];
|
||||
}
|
||||
else
|
||||
{
|
||||
GetLineCharAtIdx(cursor.mCursorTextPos, var eStartLine, var eStartCharIdx);
|
||||
GetColumnAtLineChar(eStartLine, eStartCharIdx, var column);
|
||||
x = column * mCharWidth;
|
||||
y = mLineCoords[eStartLine];
|
||||
}
|
||||
|
||||
using (g.PushColor(0xFF80FFB3))
|
||||
DrawCursor(x, y);
|
||||
}
|
||||
SetTextCursor(prevTextCursor);
|
||||
}
|
||||
|
||||
g.PopMatrix();
|
||||
|
||||
/*using (g.PushColor(0x4000FF00))
|
||||
|
|
|
|||
|
|
@ -138,8 +138,47 @@ namespace Beefy.utils
|
|||
mCurCost = 0;
|
||||
}
|
||||
|
||||
bool TryMerge(UndoAction action)
|
||||
{
|
||||
var currentBatchEnd = action as UndoBatchEnd;
|
||||
if (currentBatchEnd == null)
|
||||
return false;
|
||||
|
||||
var currentBatchStart = currentBatchEnd.mBatchStart as UndoBatchStart;
|
||||
var prevBatchEndIdx = mUndoList.IndexOf(currentBatchStart) - 1;
|
||||
if (prevBatchEndIdx <= 0)
|
||||
return false;
|
||||
|
||||
var prevBatchEnd = mUndoList[prevBatchEndIdx] as UndoBatchEnd;
|
||||
if (prevBatchEnd == null)
|
||||
return false;
|
||||
|
||||
var prevBatchStart = prevBatchEnd.mBatchStart as UndoBatchStart;
|
||||
if (prevBatchStart == null)
|
||||
return false;
|
||||
if (prevBatchStart.Merge(currentBatchStart) == false)
|
||||
return false;
|
||||
|
||||
mUndoList.Remove(currentBatchStart);
|
||||
mUndoList.Remove(currentBatchEnd);
|
||||
|
||||
mUndoList.Remove(prevBatchEnd);
|
||||
mUndoList.Add(prevBatchEnd);
|
||||
|
||||
delete currentBatchStart;
|
||||
delete currentBatchEnd;
|
||||
|
||||
mUndoIdx = (.)mUndoList.Count;
|
||||
|
||||
Debug.WriteLine("SUCCESS: Merged");
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Add(UndoAction action, bool allowMerge = true)
|
||||
{
|
||||
if ((allowMerge) && (TryMerge(action)))
|
||||
return;
|
||||
|
||||
if (mFreezeDeletes == 0)
|
||||
mCurCost += action.GetCost();
|
||||
if (action is IUndoBatchStart)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -340,6 +340,8 @@ namespace IDE
|
|||
Add("Zoom Out", new => gApp.Cmd_ZoomOut);
|
||||
Add("Zoom Reset", new => gApp.Cmd_ZoomReset);
|
||||
Add("Attach to Process", new => gApp.[Friend]DoAttach);
|
||||
Add("Select Next Match", new => gApp.Cmd_SelectNextMatch);
|
||||
Add("Skip Current Match and Select Next", new => gApp.Cmd_SkipCurrentMatchAndSelectNext);
|
||||
|
||||
Add("Test Enable Console", new => gApp.Cmd_TestEnableConsole);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4300,6 +4300,7 @@ namespace IDE
|
|||
var sourceViewPanel = GetActiveSourceViewPanel();
|
||||
if (sourceViewPanel != null)
|
||||
{
|
||||
sourceViewPanel.EditWidget.Content.RemoveSecondaryTextCursors();
|
||||
sourceViewPanel.GotoLine();
|
||||
return;
|
||||
}
|
||||
|
|
@ -5479,7 +5480,7 @@ namespace IDE
|
|||
if (ewc.HasSelection())
|
||||
ewc.GetSelectionText(debugExpr);
|
||||
else
|
||||
sourceViewPanel.GetDebugExpressionAt(ewc.CursorTextPos, debugExpr);
|
||||
sourceViewPanel.GetDebugExpressionAt(ewc.mTextCursors.Front.mCursorTextPos, debugExpr);
|
||||
dialog.Init(debugExpr);
|
||||
}
|
||||
else if (let immediatePanel = activePanel as ImmediatePanel)
|
||||
|
|
@ -5961,6 +5962,18 @@ namespace IDE
|
|||
ToggleCheck(ideCommand.mMenuItem, ref mTestEnableConsole);
|
||||
}
|
||||
|
||||
[IDECommand]
|
||||
public void Cmd_SelectNextMatch()
|
||||
{
|
||||
GetActiveSourceEditWidgetContent()?.SelectNextMatch();
|
||||
}
|
||||
|
||||
[IDECommand]
|
||||
public void Cmd_SkipCurrentMatchAndSelectNext()
|
||||
{
|
||||
GetActiveSourceEditWidgetContent()?.SkipCurrentMatchAndSelectNext();
|
||||
}
|
||||
|
||||
public void UpdateMenuItem_HasActivePanel(IMenu menu)
|
||||
{
|
||||
menu.SetDisabled(GetActivePanel() == null);
|
||||
|
|
@ -7862,6 +7875,7 @@ namespace IDE
|
|||
if (!sourceViewPanel.[Friend]mWantsFullRefresh)
|
||||
sourceViewPanel.UpdateQueuedEmitShowData();
|
||||
|
||||
sourceViewPanel.EditWidget?.Content.RemoveSecondaryTextCursors();
|
||||
return sourceViewPanel;
|
||||
}
|
||||
}
|
||||
|
|
@ -7873,6 +7887,7 @@ namespace IDE
|
|||
svTabButton.mIsTemp = true;
|
||||
sourceViewPanel.ShowHotFileIdx(showHotIdx);
|
||||
sourceViewPanel.ShowFileLocation(refHotIdx, Math.Max(0, line), Math.Max(0, column), hilitePosition);
|
||||
sourceViewPanel.EditWidget?.Content.RemoveSecondaryTextCursors();
|
||||
return sourceViewPanel;
|
||||
}
|
||||
|
||||
|
|
@ -8768,38 +8783,45 @@ namespace IDE
|
|||
return;
|
||||
|
||||
var ewc = sourceViewPanel.mEditWidget.mEditWidgetContent;
|
||||
if (!ewc.HasSelection())
|
||||
return;
|
||||
|
||||
/*ewc.mSelection.Value.GetAsForwardSelect(var startPos, var endPos);
|
||||
for (int i = startPos; i < endPos; i++)
|
||||
for (var cursor in ewc.mTextCursors)
|
||||
{
|
||||
var c = ref ewc.mData.mText[i].mChar;
|
||||
ewc.SetTextCursor(cursor);
|
||||
if (!ewc.HasSelection())
|
||||
continue;
|
||||
|
||||
/*ewc.mSelection.Value.GetAsForwardSelect(var startPos, var endPos);
|
||||
for (int i = startPos; i < endPos; i++)
|
||||
{
|
||||
var c = ref ewc.mData.mText[i].mChar;
|
||||
if (toUpper)
|
||||
c = c.ToUpper;
|
||||
else
|
||||
c = c.ToLower;
|
||||
}*/
|
||||
|
||||
var prevSel = ewc.mSelection.Value;
|
||||
|
||||
var str = scope String();
|
||||
ewc.GetSelectionText(str);
|
||||
|
||||
var prevStr = scope String();
|
||||
prevStr.Append(str);
|
||||
|
||||
if (toUpper)
|
||||
c = c.ToUpper;
|
||||
str.ToUpper();
|
||||
else
|
||||
c = c.ToLower;
|
||||
}*/
|
||||
str.ToLower();
|
||||
|
||||
var prevSel = ewc.mSelection.Value;
|
||||
if (str == prevStr)
|
||||
continue;
|
||||
|
||||
var str = scope String();
|
||||
ewc.GetSelectionText(str);
|
||||
ewc.CreateMultiCursorUndoBatch("IDEApp.ChangeCase()");
|
||||
ewc.InsertAtCursor(str);
|
||||
|
||||
var prevStr = scope String();
|
||||
prevStr.Append(str);
|
||||
|
||||
if (toUpper)
|
||||
str.ToUpper();
|
||||
else
|
||||
str.ToLower();
|
||||
|
||||
if (str == prevStr)
|
||||
return;
|
||||
|
||||
ewc.InsertAtCursor(str);
|
||||
|
||||
ewc.mSelection = prevSel;
|
||||
ewc.mSelection = prevSel;
|
||||
}
|
||||
ewc.CloseMultiCursorUndoBatch();
|
||||
ewc.SetPrimaryTextCursor();
|
||||
}
|
||||
|
||||
public bool IsFilteredOut(String fileName)
|
||||
|
|
|
|||
|
|
@ -995,7 +995,7 @@ namespace IDE.ui
|
|||
|
||||
List<StringView> textSections = scope List<StringView>(selectedEntry.mText.Split('\x01'));
|
||||
|
||||
int cursorPos = mAutoComplete.mTargetEditWidget.Content.CursorTextPos;
|
||||
int cursorPos = mAutoComplete.mTargetEditWidget.Content.mTextCursors.Front.mCursorTextPos;
|
||||
for (int sectionIdx = 0; sectionIdx < mAutoComplete.mInvokeSrcPositions.Count - 1; sectionIdx++)
|
||||
{
|
||||
if (cursorPos > mAutoComplete.mInvokeSrcPositions[sectionIdx])
|
||||
|
|
@ -1445,7 +1445,7 @@ namespace IDE.ui
|
|||
|
||||
if ((mInvokeWindow != null) && (!mInvokeWidget.mIsAboveText))
|
||||
{
|
||||
int textIdx = mTargetEditWidget.Content.CursorTextPos;
|
||||
int textIdx = mTargetEditWidget.Content.mTextCursors.Front.mCursorTextPos;
|
||||
int line = 0;
|
||||
int column = 0;
|
||||
if (textIdx >= 0)
|
||||
|
|
@ -1563,7 +1563,11 @@ namespace IDE.ui
|
|||
{
|
||||
if ((mInsertEndIdx != -1) && (mInsertStartIdx != -1))
|
||||
{
|
||||
mTargetEditWidget.Content.ExtractString(mInsertStartIdx, Math.Max(mInsertEndIdx - mInsertStartIdx, 0), outFilter);
|
||||
var length = Math.Abs(mInsertEndIdx - mInsertStartIdx);
|
||||
if (length == 0)
|
||||
return;
|
||||
var start = Math.Min(mInsertStartIdx, mInsertEndIdx);
|
||||
mTargetEditWidget.Content.ExtractString(start, length, outFilter);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1571,13 +1575,33 @@ namespace IDE.ui
|
|||
{
|
||||
//Debug.WriteLine("GetAsyncTextPos start {0} {1}", mInsertStartIdx, mInsertEndIdx);
|
||||
|
||||
mInsertEndIdx = (int32)mTargetEditWidget.Content.CursorTextPos;
|
||||
while ((mInsertStartIdx != -1) && (mInsertStartIdx < mInsertEndIdx))
|
||||
mInsertEndIdx = (int32)mTargetEditWidget.Content.mTextCursors.Front.mCursorTextPos;
|
||||
/*while ((mInsertStartIdx != -1) && (mInsertStartIdx < mInsertEndIdx))
|
||||
{
|
||||
char8 c = (char8)mTargetEditWidget.Content.mData.mText[mInsertStartIdx].mChar;
|
||||
if ((c != ' ') && (c != ','))
|
||||
Debug.WriteLine("StartIdx: {}, EndIdx: {}, mData.mText[startIdx]: '{}'", mInsertStartIdx, mInsertEndIdx, c);
|
||||
if ((c != ' ') && (c != ',') && (c != '('))
|
||||
break;
|
||||
mInsertStartIdx++;
|
||||
}*/
|
||||
mInsertStartIdx = mInsertEndIdx-1;
|
||||
while ((mInsertStartIdx <= mInsertEndIdx) && (mInsertStartIdx > 0))
|
||||
{
|
||||
var data = mTargetEditWidget.Content.mData.mText[mInsertStartIdx - 1];
|
||||
var type = (SourceElementType)data.mDisplayTypeId;
|
||||
var char = data.mChar;
|
||||
|
||||
// Explicit delimeters
|
||||
if ((char == '\n') || (char == '}') || (char == ';') || (char == '.'))
|
||||
break;
|
||||
|
||||
if (char.IsWhiteSpace)
|
||||
break;
|
||||
|
||||
if ((!char.IsLetterOrDigit) && (char != '_') && (type != .Keyword) && (!char.IsWhiteSpace) && (data.mChar != '@'))
|
||||
break;
|
||||
|
||||
mInsertStartIdx--;
|
||||
}
|
||||
|
||||
/*mInsertStartIdx = mInsertEndIdx;
|
||||
|
|
@ -2402,6 +2426,11 @@ namespace IDE.ui
|
|||
}
|
||||
continue;
|
||||
}
|
||||
else if (entryDisplay.Length == 0)
|
||||
{
|
||||
// Skip entry that has no name
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (entryType)
|
||||
{
|
||||
|
|
@ -2549,7 +2578,7 @@ namespace IDE.ui
|
|||
}*/
|
||||
}
|
||||
|
||||
if (changedAfterInfo)
|
||||
if ((changedAfterInfo) || (mTargetEditWidget.Content.mTextCursors.Count > 1))
|
||||
{
|
||||
GetAsyncTextPos();
|
||||
}
|
||||
|
|
@ -2561,7 +2590,7 @@ namespace IDE.ui
|
|||
mTargetEditWidget.Content.GetLineCharAtIdx(mInvokeSrcPositions[0], out invokeLine, out invokeColumn);
|
||||
int insertLine = 0;
|
||||
int insertColumn = 0;
|
||||
mTargetEditWidget.Content.GetLineCharAtIdx(mTargetEditWidget.Content.CursorTextPos, out insertLine, out insertColumn);
|
||||
mTargetEditWidget.Content.GetLineCharAtIdx(mTargetEditWidget.Content.mTextCursors.Front.mCursorTextPos, out insertLine, out insertColumn);
|
||||
|
||||
if ((insertLine != invokeLine) && ((insertLine - invokeLine) * gApp.mCodeFont.GetHeight() < GS!(40)))
|
||||
mInvokeWidget.mIsAboveText = true;
|
||||
|
|
@ -2569,7 +2598,7 @@ namespace IDE.ui
|
|||
|
||||
mInfoFilter = new String();
|
||||
GetFilter(mInfoFilter);
|
||||
UpdateData(selectString, changedAfterInfo);
|
||||
UpdateData(selectString, changedAfterInfo);
|
||||
mPopulating = false;
|
||||
|
||||
//Debug.WriteLine("SetInfo {0} {1}", mInsertStartIdx, mInsertEndIdx);
|
||||
|
|
@ -2720,7 +2749,7 @@ namespace IDE.ui
|
|||
|
||||
var targetSourceEditWidgetContent = mTargetEditWidget.Content as SourceEditWidgetContent;
|
||||
var sourceEditWidgetContent = targetSourceEditWidgetContent;
|
||||
var prevCursorPosition = sourceEditWidgetContent.CursorTextPos;
|
||||
var prevCursorPosition = sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
var prevScrollPos = mTargetEditWidget.mVertPos.mDest;
|
||||
|
||||
UndoBatchStart undoBatchStart = null;
|
||||
|
|
@ -2801,7 +2830,7 @@ namespace IDE.ui
|
|||
return;
|
||||
}
|
||||
|
||||
sourceEditWidgetContent.CursorTextPos = fixitIdx;
|
||||
sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos = fixitIdx;
|
||||
if (focusChange)
|
||||
sourceEditWidgetContent.EnsureCursorVisible(true, true);
|
||||
|
||||
|
|
@ -2818,7 +2847,7 @@ namespace IDE.ui
|
|||
else
|
||||
InsertImplText(sourceEditWidgetContent, fixitInsert);
|
||||
|
||||
fixitIdx = (.)sourceEditWidgetContent.CursorTextPos;
|
||||
fixitIdx = (.)sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
insertCount++;
|
||||
}
|
||||
}
|
||||
|
|
@ -2826,9 +2855,9 @@ namespace IDE.ui
|
|||
if (!focusChange)
|
||||
{
|
||||
mTargetEditWidget.VertScrollTo(prevScrollPos, true);
|
||||
sourceEditWidgetContent.CursorTextPos = prevCursorPosition;
|
||||
sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos = prevCursorPosition;
|
||||
int addedSize = sourceEditWidgetContent.mData.mTextLength - prevTextLength;
|
||||
sourceEditWidgetContent.[Friend]AdjustCursorsAfterExternalEdit(fixitIdx, addedSize);
|
||||
sourceEditWidgetContent.[Friend]AdjustCursorsAfterExternalEdit(fixitIdx, addedSize, 0);
|
||||
}
|
||||
|
||||
if (historyEntry != null)
|
||||
|
|
@ -2891,9 +2920,9 @@ namespace IDE.ui
|
|||
}
|
||||
if (!sourceEditWidgetContent.IsLineWhiteSpace(sourceEditWidgetContent.CursorLineAndColumn.mLine))
|
||||
{
|
||||
int prevPos = sourceEditWidgetContent.CursorTextPos;
|
||||
int prevPos = sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
sourceEditWidgetContent.InsertAtCursor("\n");
|
||||
sourceEditWidgetContent.CursorTextPos = prevPos;
|
||||
sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos = (int32)prevPos;
|
||||
}
|
||||
sourceEditWidgetContent.CursorToLineEnd();
|
||||
}
|
||||
|
|
@ -2910,7 +2939,7 @@ namespace IDE.ui
|
|||
}
|
||||
else if (c == '\b') // Close block
|
||||
{
|
||||
int cursorPos = sourceEditWidgetContent.CursorTextPos;
|
||||
int cursorPos = sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
while (cursorPos < sourceEditWidgetContent.mData.mTextLength)
|
||||
{
|
||||
char8 checkC = sourceEditWidgetContent.mData.mText[cursorPos].mChar;
|
||||
|
|
@ -2918,7 +2947,7 @@ namespace IDE.ui
|
|||
if (checkC == '}')
|
||||
break;
|
||||
}
|
||||
sourceEditWidgetContent.CursorTextPos = cursorPos;
|
||||
sourceEditWidgetContent.mTextCursors.Front.mCursorTextPos = (int32)cursorPos;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2950,70 +2979,100 @@ namespace IDE.ui
|
|||
}
|
||||
}
|
||||
|
||||
public void InsertSelection(char32 keyChar, String insertType = null, String insertStr = null)
|
||||
{
|
||||
//Debug.WriteLine("InsertSelection");
|
||||
public void InsertSelection(char32 keyChar, String insertType = null, String insertStr = null)
|
||||
{
|
||||
var sewc = mTargetEditWidget.Content as SourceEditWidgetContent;
|
||||
Debug.Assert(sewc.IsPrimaryTextCursor());
|
||||
var isExplicitInsert = (keyChar == '\0') || (keyChar == '\t') || (keyChar == '\n') || (keyChar == '\r');
|
||||
|
||||
EditSelection editSelection = EditSelection();
|
||||
editSelection.mStartPos = mInsertStartIdx;
|
||||
if (mInsertEndIdx != -1)
|
||||
editSelection.mEndPos = mInsertEndIdx;
|
||||
else
|
||||
editSelection.mEndPos = mInsertStartIdx;
|
||||
|
||||
var entry = mAutoCompleteListWidget.mEntryList[mAutoCompleteListWidget.mSelectIdx];
|
||||
if (keyChar == '!')
|
||||
{
|
||||
if (!entry.mEntryDisplay.EndsWith("!"))
|
||||
{
|
||||
// Try to find one that DOES end with a '!'
|
||||
for (var checkEntry in mAutoCompleteListWidget.mEntryList)
|
||||
{
|
||||
if (checkEntry.mEntryDisplay.EndsWith("!"))
|
||||
entry = checkEntry;
|
||||
}
|
||||
}
|
||||
}
|
||||
AutoCompleteListWidget.EntryWidget GetEntry()
|
||||
{
|
||||
var entry = mAutoCompleteListWidget.mEntryList[mAutoCompleteListWidget.mSelectIdx];
|
||||
if ((keyChar == '!') && (!entry.mEntryDisplay.EndsWith("!")))
|
||||
{
|
||||
// Try to find one that DOES end with a '!'
|
||||
for (var checkEntry in mAutoCompleteListWidget.mEntryList)
|
||||
{
|
||||
if (checkEntry.mEntryDisplay.EndsWith("!"))
|
||||
return checkEntry;
|
||||
}
|
||||
}
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
EditSelection CalculateSelection(String implText)
|
||||
{
|
||||
var endPos = (int32)sewc.CursorTextPos;
|
||||
var startPos = endPos;
|
||||
var wentOverWhitespace = false;
|
||||
while ((startPos <= endPos) && (startPos > 0))
|
||||
{
|
||||
var data = sewc.mData.mText[startPos - 1];
|
||||
var type = (SourceElementType)data.mDisplayTypeId;
|
||||
|
||||
// Explicit delimeters
|
||||
if ((data.mChar == '\n') || (data.mChar == '}') || (data.mChar == ';') || (data.mChar == '.'))
|
||||
break;
|
||||
|
||||
var isWhiteSpace = data.mChar.IsWhiteSpace;
|
||||
var isLetterOrDigit = data.mChar.IsLetterOrDigit;
|
||||
|
||||
// When it's not a override method for example
|
||||
// we break right after we find a non-letter-or-digit character
|
||||
// So we would only select last word
|
||||
if ((implText == null) && (!isLetterOrDigit) && (data.mChar != '_') && (data.mChar != '@'))
|
||||
break;
|
||||
|
||||
// This is for cases, when we are searching for
|
||||
if ((!isLetterOrDigit) && (type != .Keyword) && (!isWhiteSpace) && (data.mChar != '_'))
|
||||
break;
|
||||
|
||||
wentOverWhitespace = isWhiteSpace;
|
||||
startPos--;
|
||||
}
|
||||
|
||||
if (wentOverWhitespace)
|
||||
startPos++;
|
||||
|
||||
return EditSelection(startPos, endPos);
|
||||
}
|
||||
|
||||
var entry = GetEntry();
|
||||
if (insertStr != null)
|
||||
insertStr.Append(entry.mEntryInsert ?? entry.mEntryDisplay);
|
||||
|
||||
if (entry.mEntryType == "fixit")
|
||||
{
|
||||
if (insertType != null)
|
||||
insertType.Append(entry.mEntryType);
|
||||
insertType.Append(entry.mEntryType);
|
||||
sewc.RemoveSecondaryTextCursors();
|
||||
ApplyFixit(entry.mEntryInsert);
|
||||
return;
|
||||
}
|
||||
|
||||
bool isExplicitInsert = (keyChar == '\0') || (keyChar == '\t') || (keyChar == '\n') || (keyChar == '\r');
|
||||
|
||||
String insertText = entry.mEntryInsert ?? entry.mEntryDisplay;
|
||||
var insertText = scope String(entry.mEntryInsert ?? entry.mEntryDisplay);
|
||||
if ((!isExplicitInsert) && (insertText.Contains('\t')))
|
||||
{
|
||||
// Don't insert multi-line blocks unless we have an explicit insert request (click, tab, or enter)
|
||||
return;
|
||||
}
|
||||
|
||||
if ((keyChar == '=') && (insertText.EndsWith("=")))
|
||||
if ((keyChar == '=') && (insertText.EndsWith("=")))
|
||||
insertText.RemoveToEnd(insertText.Length - 1);
|
||||
//insertText = insertText.Substring(0, insertText.Length - 1);
|
||||
String implText = null;
|
||||
int tabIdx = insertText.IndexOf('\t');
|
||||
int splitIdx = tabIdx;
|
||||
int crIdx = insertText.IndexOf('\r');
|
||||
if ((crIdx != -1) && (tabIdx != -1) && (crIdx < tabIdx))
|
||||
splitIdx = crIdx;
|
||||
if (splitIdx != -1)
|
||||
{
|
||||
implText = scope:: String();
|
||||
implText.Append(insertText, splitIdx);
|
||||
insertText.RemoveToEnd(splitIdx);
|
||||
}
|
||||
String prevText = scope String();
|
||||
mTargetEditWidget.Content.ExtractString(editSelection.mStartPos, editSelection.mEndPos - editSelection.mStartPos, prevText);
|
||||
|
||||
//sAutoCompleteMRU[insertText] = sAutoCompleteIdx++;
|
||||
// Save persistent text positions
|
||||
PersistentTextPosition[] persistentInvokeSrcPositons = null;
|
||||
if (mInvokeSrcPositions != null)
|
||||
{
|
||||
persistentInvokeSrcPositons = scope:: PersistentTextPosition[mInvokeSrcPositions.Count];
|
||||
for (int32 i = 0; i < mInvokeSrcPositions.Count; i++)
|
||||
{
|
||||
persistentInvokeSrcPositons[i] = new PersistentTextPosition(mInvokeSrcPositions[i]);
|
||||
sewc.PersistentTextPositions.Add(persistentInvokeSrcPositons[i]);
|
||||
}
|
||||
}
|
||||
|
||||
String* keyPtr;
|
||||
int32* valuePtr;
|
||||
if (sAutoCompleteMRU.TryAdd(entry.mEntryDisplay, out keyPtr, out valuePtr))
|
||||
|
|
@ -3023,64 +3082,68 @@ namespace IDE.ui
|
|||
}
|
||||
*valuePtr = sAutoCompleteIdx++;
|
||||
|
||||
if (insertText == prevText)
|
||||
return;
|
||||
String implText = null;
|
||||
int tabIdx = insertText.IndexOf('\t');
|
||||
int splitIdx = tabIdx;
|
||||
int crIdx = insertText.IndexOf('\r');
|
||||
if ((crIdx != -1) && (tabIdx != -1) && (crIdx < tabIdx))
|
||||
splitIdx = crIdx;
|
||||
if (splitIdx != -1)
|
||||
{
|
||||
implText = scope:: String();
|
||||
implText.Append(insertText, splitIdx);
|
||||
insertText.RemoveToEnd(splitIdx);
|
||||
}
|
||||
|
||||
var sourceEditWidgetContent = mTargetEditWidget.Content as SourceEditWidgetContent;
|
||||
for (var cursor in sewc.mTextCursors)
|
||||
{
|
||||
sewc.SetTextCursor(cursor);
|
||||
var editSelection = CalculateSelection(implText);
|
||||
|
||||
PersistentTextPosition[] persistentInvokeSrcPositons = null;
|
||||
if (mInvokeSrcPositions != null)
|
||||
{
|
||||
persistentInvokeSrcPositons = scope:: PersistentTextPosition[mInvokeSrcPositions.Count];
|
||||
for (int32 i = 0; i < mInvokeSrcPositions.Count; i++)
|
||||
{
|
||||
persistentInvokeSrcPositons[i] = new PersistentTextPosition(mInvokeSrcPositions[i]);
|
||||
sourceEditWidgetContent.PersistentTextPositions.Add(persistentInvokeSrcPositons[i]);
|
||||
}
|
||||
}
|
||||
var prevText = scope String();
|
||||
sewc.ExtractString(editSelection.MinPos, editSelection.Length, prevText);
|
||||
if ((prevText.Length > 0) && (insertText == prevText))
|
||||
continue;
|
||||
|
||||
mTargetEditWidget.Content.mSelection = editSelection;
|
||||
//bool isMethod = (entry.mEntryType == "method");
|
||||
if (insertText.EndsWith("<>"))
|
||||
{
|
||||
if (keyChar == '\t')
|
||||
mTargetEditWidget.Content.InsertCharPair(insertText);
|
||||
else if (keyChar == '<')
|
||||
sewc.mSelection = editSelection;
|
||||
sewc.mCursorTextPos = (int32)editSelection.MaxPos;
|
||||
|
||||
if (insertText.EndsWith("<>"))
|
||||
{
|
||||
String str = scope String();
|
||||
str.Append(insertText, 0, insertText.Length - 2);
|
||||
mTargetEditWidget.Content.InsertAtCursor(str, .NoRestoreSelectionOnUndo);
|
||||
if (keyChar == '\t')
|
||||
sewc.InsertCharPair(insertText);
|
||||
else if (keyChar == '<')
|
||||
{
|
||||
var str = scope String();
|
||||
str.Append(insertText, 0, insertText.Length - 2);
|
||||
sewc.InsertAtCursor(str, .NoRestoreSelectionOnUndo);
|
||||
}
|
||||
else
|
||||
sewc.InsertAtCursor(insertText, .NoRestoreSelectionOnUndo);
|
||||
}
|
||||
else
|
||||
mTargetEditWidget.Content.InsertAtCursor(insertText, .NoRestoreSelectionOnUndo);
|
||||
}
|
||||
else
|
||||
mTargetEditWidget.Content.InsertAtCursor(insertText, .NoRestoreSelectionOnUndo);
|
||||
else
|
||||
sewc.InsertAtCursor(insertText, .NoRestoreSelectionOnUndo);
|
||||
|
||||
/*if (mIsAsync)
|
||||
UpdateAsyncInfo();*/
|
||||
if (implText != null)
|
||||
InsertImplText(sewc, implText);
|
||||
}
|
||||
|
||||
if (implText != null)
|
||||
InsertImplText(sourceEditWidgetContent, implText);
|
||||
|
||||
if (persistentInvokeSrcPositons != null)
|
||||
{
|
||||
for (int32 i = 0; i < mInvokeSrcPositions.Count; i++)
|
||||
{
|
||||
//TEST
|
||||
//var persistentTextPositon = persistentInvokeSrcPositons[i + 100];
|
||||
// Load persistent text positions back
|
||||
if (persistentInvokeSrcPositons != null)
|
||||
{
|
||||
for (int32 i = 0; i < mInvokeSrcPositions.Count; i++)
|
||||
{
|
||||
var persistentTextPositon = persistentInvokeSrcPositons[i];
|
||||
mInvokeSrcPositions[i] = persistentTextPositon.mIndex;
|
||||
sourceEditWidgetContent.PersistentTextPositions.Remove(persistentTextPositon);
|
||||
mInvokeSrcPositions[i] = persistentTextPositon.mIndex;
|
||||
sewc.PersistentTextPositions.Remove(persistentTextPositon);
|
||||
delete persistentTextPositon;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sewc.SetPrimaryTextCursor();
|
||||
sewc.EnsureCursorVisible();
|
||||
}
|
||||
|
||||
mTargetEditWidget.Content.EnsureCursorVisible();
|
||||
if ((insertType != null) && (insertText.Length > 0))
|
||||
insertType.Append(entry.mEntryType);
|
||||
}
|
||||
|
||||
public void MarkDirty()
|
||||
{
|
||||
if (mInvokeWidget != null)
|
||||
|
|
|
|||
|
|
@ -225,6 +225,13 @@ namespace IDE.ui
|
|||
|
||||
if (evt.mKeyCode == KeyCode.Return)
|
||||
{
|
||||
var keyFlags = mWidgetWindow.GetKeyFlags(true);
|
||||
if (keyFlags.HasFlag(.Alt))
|
||||
{
|
||||
SelectAllMatches(keyFlags.HasFlag(.Shift));
|
||||
Close();
|
||||
return;
|
||||
}
|
||||
if (evt.mSender == mFindEditWidget)
|
||||
{
|
||||
FindNext(1, true);
|
||||
|
|
@ -249,6 +256,108 @@ namespace IDE.ui
|
|||
DoReplace(true);
|
||||
}
|
||||
|
||||
bool SelectAllMatches(bool caseSensitive)
|
||||
{
|
||||
var ewc = mEditWidget.Content;
|
||||
var sewc = ewc as SourceEditWidgetContent;
|
||||
ewc.SetPrimaryTextCursor();
|
||||
|
||||
String findText = scope String();
|
||||
mFindEditWidget.GetText(findText);
|
||||
sLastSearchString.Set(findText);
|
||||
if (findText.Length == 0)
|
||||
return false;
|
||||
|
||||
String findTextLower = scope String(findText);
|
||||
findTextLower.ToLower();
|
||||
String findTextUpper = scope String(findText);
|
||||
findTextUpper.ToUpper();
|
||||
|
||||
int32 selStart = (mSelectionStart != null) ? mSelectionStart.mIndex : 0;
|
||||
int32 selEnd = (mSelectionEnd != null) ? mSelectionEnd.mIndex : ewc.mData.mTextLength;
|
||||
|
||||
|
||||
bool Matches(int32 idx)
|
||||
{
|
||||
if (idx + findText.Length >= ewc.mData.mTextLength)
|
||||
return false;
|
||||
|
||||
for (var i = 0; i < findText.Length; i++)
|
||||
{
|
||||
var char = ewc.mData.mText[idx+i].mChar;
|
||||
|
||||
if (caseSensitive)
|
||||
{
|
||||
if (findText[i] != char)
|
||||
return false;
|
||||
}
|
||||
else if ((findTextLower[i] != char) && (findTextUpper[i] != char))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var primaryCursor = ewc.mTextCursors.Front;
|
||||
var initialCursorPos = primaryCursor.mCursorTextPos;
|
||||
EditWidgetContent.TextCursor swapCursor = null;
|
||||
|
||||
ewc.RemoveSecondaryTextCursors();
|
||||
|
||||
primaryCursor.mJustInsertedCharPair = false;
|
||||
primaryCursor.mCursorImplicitlyMoved = false;
|
||||
primaryCursor.mVirtualCursorPos = null;
|
||||
|
||||
var isFirstMatch = true;
|
||||
|
||||
for (var idx = selStart; idx < selEnd; idx++)
|
||||
{
|
||||
if (!Matches(idx))
|
||||
continue;
|
||||
|
||||
if (!isFirstMatch)
|
||||
{
|
||||
var cursor = ewc.mTextCursors.Add(.. new EditWidgetContent.TextCursor(-1, primaryCursor));
|
||||
if (cursor.mCursorTextPos == initialCursorPos)
|
||||
swapCursor = cursor;
|
||||
}
|
||||
|
||||
isFirstMatch = false;
|
||||
|
||||
primaryCursor.mCursorTextPos = (int32)(idx + findText.Length);
|
||||
primaryCursor.mSelection = EditSelection(idx, primaryCursor.mCursorTextPos);
|
||||
|
||||
idx += (int32)findText.Length;
|
||||
}
|
||||
|
||||
// Remove selection when at least one match has been found
|
||||
if ((sewc != null) && (!isFirstMatch))
|
||||
{
|
||||
if (mSelectionStart != null)
|
||||
{
|
||||
sewc.PersistentTextPositions.Remove(mSelectionStart);
|
||||
DeleteAndNullify!(mSelectionStart);
|
||||
}
|
||||
|
||||
if (mSelectionEnd != null)
|
||||
{
|
||||
sewc.PersistentTextPositions.Remove(mSelectionEnd);
|
||||
DeleteAndNullify!(mSelectionEnd);
|
||||
}
|
||||
}
|
||||
|
||||
// Making sure that primary cursor is at the position where QuickFind found first match.
|
||||
if (swapCursor != null)
|
||||
{
|
||||
Swap!(primaryCursor.mCursorTextPos, swapCursor.mCursorTextPos);
|
||||
Swap!(primaryCursor.mSelection.Value, swapCursor.mSelection.Value);
|
||||
}
|
||||
|
||||
return (!isFirstMatch);
|
||||
}
|
||||
|
||||
void EditWidgetSubmit(EditEvent editEvent)
|
||||
{
|
||||
//FindNext(true);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1323,7 +1323,7 @@ namespace IDE.ui
|
|||
|
||||
embedSource.mTypeName = new .(useTypeName);
|
||||
if (embedHasFocus)
|
||||
embedSource.mCursorIdx = (.)embedSourceViewPanel.mEditWidget.mEditWidgetContent.CursorTextPos;
|
||||
embedSource.mCursorIdx = (.)embedSourceViewPanel.mEditWidget.mEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
else
|
||||
embedSource.mCursorIdx = -1;
|
||||
resolveParams.mEmitEmbeds.Add(embedSource);
|
||||
|
|
@ -1385,7 +1385,7 @@ namespace IDE.ui
|
|||
{
|
||||
if ((useResolveType == .Autocomplete) || (useResolveType == .GetSymbolInfo) || (mIsClang))
|
||||
{
|
||||
resolveParams.mOverrideCursorPos = (.)mEditWidget.Content.CursorTextPos;
|
||||
resolveParams.mOverrideCursorPos = (.)mEditWidget.Content.mTextCursors.Front.mCursorTextPos;
|
||||
/*if (useResolveType == .Autocomplete)
|
||||
resolveParams.mOverrideCursorPos--;*/
|
||||
}
|
||||
|
|
@ -2042,7 +2042,7 @@ namespace IDE.ui
|
|||
|
||||
ProjectSource projectSource = FilteredProjectSource;
|
||||
|
||||
int cursorPos = mEditWidget.mEditWidgetContent.CursorTextPos;
|
||||
int cursorPos = mEditWidget.mEditWidgetContent.mTextCursors.Front.mCursorTextPos;
|
||||
|
||||
if ((resolveParams != null) && (resolveParams.mOverrideCursorPos != -1))
|
||||
cursorPos = resolveParams.mOverrideCursorPos;
|
||||
|
|
@ -5254,7 +5254,10 @@ namespace IDE.ui
|
|||
|
||||
var sourceEditWidgetContent = (SourceEditWidgetContent)mEditWidget.Content;
|
||||
if (!sourceEditWidgetContent.CheckReadOnly())
|
||||
{
|
||||
sourceEditWidgetContent.RemoveSecondaryTextCursors();
|
||||
ShowSymbolReferenceHelper(SymbolReferenceHelper.Kind.Rename);
|
||||
}
|
||||
}
|
||||
|
||||
public void FindAllReferences()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue