tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix comment stream without selection bug. 

[BUG_FIXED] Fix Find in files results highlighting problem.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@619 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2010-02-24 00:06:12 +00:00
parent 52dc1c9d87
commit 7a236ed330
2 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -277,7 +277,7 @@ const wchar_t * WcharMbcsConvertor::char2wchar(const char * mbcs2Convert, UINT c
} }
len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, len); len = MultiByteToWideChar(codepage, 0, mbcs2Convert, -1, _wideCharStr, len);
if ((size_t)*mstart < strlen(mbcs2Convert) && (size_t)*mend < strlen(mbcs2Convert)) if ((size_t)*mstart < strlen(mbcs2Convert) && (size_t)*mend <= strlen(mbcs2Convert))
{ {
*mstart = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mstart, _wideCharStr, 0); *mstart = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mstart, _wideCharStr, 0);
*mend = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mend, _wideCharStr, 0); *mend = MultiByteToWideChar(codepage, 0, mbcs2Convert, *mend, _wideCharStr, 0);
@ -287,11 +287,6 @@ const wchar_t * WcharMbcsConvertor::char2wchar(const char * mbcs2Convert, UINT c
*mend = 0; *mend = 0;
} }
} }
else
{
*mstart = 0;
*mend = 0;
}
} }
else else
{ {
@ -356,11 +351,6 @@ const char * WcharMbcsConvertor::wchar2char(const wchar_t * wcharStr2Convert, UI
*mend = 0; *mend = 0;
} }
} }
else
{
*mstart = 0;
*mend = 0;
}
} }
else else
_multiByteStr[0] = 0; _multiByteStr[0] = 0;

36
PowerEditor/src/Notepad_plus.cpp
View File

@ -2825,7 +2825,7 @@ bool Notepad_plus::doBlockComment(comment_mode currCommentMode)
generic_string comment(commentLineSybol); generic_string comment(commentLineSybol);
comment += TEXT(" "); comment += TEXT(" ");
const int linebufferSize = 1000; const int linebufferSize = 1024;
TCHAR linebuf[linebufferSize]; TCHAR linebuf[linebufferSize];
size_t comment_length = comment.length(); size_t comment_length = comment.length();
size_t selectionStart = _pEditView->execute(SCI_GETSELECTIONSTART); size_t selectionStart = _pEditView->execute(SCI_GETSELECTIONSTART);
@ -2949,41 +2949,13 @@ bool Notepad_plus::doStreamComment()
size_t caretPosition = _pEditView->execute(SCI_GETCURRENTPOS); size_t caretPosition = _pEditView->execute(SCI_GETCURRENTPOS);
// checking if caret is located in _beginning_ of selected block // checking if caret is located in _beginning_ of selected block
bool move_caret = caretPosition < selectionEnd; bool move_caret = caretPosition < selectionEnd;
// if there is no selection? // if there is no selection?
if (selectionEnd - selectionStart <= 0) if (selectionEnd - selectionStart <= 0)
{ {
int selLine = _pEditView->execute(SCI_LINEFROMPOSITION, selectionStart); int selLine = _pEditView->execute(SCI_LINEFROMPOSITION, selectionStart);
int lineIndent = _pEditView->execute(SCI_GETLINEINDENTPOSITION, selLine); selectionStart = _pEditView->execute(SCI_GETLINEINDENTPOSITION, selLine);
int lineEnd = _pEditView->execute(SCI_GETLINEENDPOSITION, selLine); selectionEnd = _pEditView->execute(SCI_GETLINEENDPOSITION, selLine);
TCHAR linebuf[1000];
_pEditView->getGenericText(linebuf, lineIndent, lineEnd);
int caret = _pEditView->execute(SCI_GETCURRENTPOS);
int line = _pEditView->execute(SCI_LINEFROMPOSITION, caret);
int lineStart = _pEditView->execute(SCI_POSITIONFROMLINE, line);
int current = caret - lineStart;
// checking if we are not inside a word
int startword = current;
int endword = current;
int start_counter = 0;
int end_counter = 0;
while (startword > 0)// && wordCharacters.contains(linebuf[startword - 1]))
{
start_counter++;
startword--;
}
// checking _beginning_ of the word
if (startword == current)
return true; // caret is located _before_ a word
while (linebuf[endword + 1] != '\0') // && wordCharacters.contains(linebuf[endword + 1]))
{
end_counter++;
endword++;
}
selectionStart -= start_counter;
selectionEnd += (end_counter + 1);
} }
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
_pEditView->insertGenericTextFrom(selectionStart, start_comment.c_str()); _pEditView->insertGenericTextFrom(selectionStart, start_comment.c_str());