tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-25 23:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] Fix Find in files result display problem (unicode).

Browse Source 
Fix smart hilite bug that it doesn't work with the word contain the accent(s).

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@196 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-05-03 22:08:53 +00:00
parent d8d5ce965f
commit 537e3ad70e
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/Notepad_plus.h
View File

@ -698,9 +698,9 @@ private:
}; };
bool isWordChar(char ch) const { bool isWordChar(char ch) const {
if (ch < 0x20) if ((unsigned char)ch < 0x20)
return false; return false;
switch(ch) switch(ch)
{ {
case ' ': case ' ':

7
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1164,7 +1164,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
_line[nbChar+2] = '\0'; _line[nbChar+2] = '\0';
const char *pLine; const char *pLine;
if (isUnicode) if (!isUnicode)
{ {
ascii_to_utf8(_line, (nbChar + 3), _uniCharLine); ascii_to_utf8(_line, (nbChar + 3), _uniCharLine);
pLine = _uniCharLine; pLine = _uniCharLine;
@ -1173,6 +1173,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
{ {
pLine = _line; pLine = _line;
} }
//printStr(isUnicode?"unicode":"no unicode");
_pFinder->add(FoundInfo(start, end, pLine, fileName, _pFinder->_lineCounter), lineNumber + 1); _pFinder->add(FoundInfo(start, end, pLine, fileName, _pFinder->_lineCounter), lineNumber + 1);
startPosition = posFind + foundTextLen; startPosition = posFind + foundTextLen;
@ -1235,7 +1236,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
delete [] pTextFind; delete [] pTextFind;
delete [] pTextReplace; delete [] pTextReplace;
return nbReplaced; return nbReplaced;
break; } }
} }
@ -1293,10 +1294,8 @@ void FindReplaceDlg::findAllIn(InWhat op)
// overwrite some default settings // overwrite some default settings
_pFinder->_scintView.showMargin(ScintillaEditView::_SC_MARGE_SYBOLE, false); _pFinder->_scintView.showMargin(ScintillaEditView::_SC_MARGE_SYBOLE, false);
_pFinder->_scintView.setMakerStyle(FOLDER_STYLE_SIMPLE); _pFinder->_scintView.setMakerStyle(FOLDER_STYLE_SIMPLE);
//_pFinder->_scintView.execute(SCI_SETZOOM, _pFinder->_scintView.execute(SCI_GETZOOM) - 2);
_pFinder->_scintView.display(); _pFinder->_scintView.display();
_pFinder->display(); _pFinder->display();
} }

3
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -274,7 +274,6 @@ public :
void getPatterns(vector<string> & patternVect); void getPatterns(vector<string> & patternVect);
void launchFindInFilesDlg() { void launchFindInFilesDlg() {
//::SendMessage(_hSelf, WM_COMMAND, IDC_FINDINFILES, 0);
doDialog(FINDINFILES_DLG); doDialog(FINDINFILES_DLG);
}; };
@ -406,8 +405,6 @@ private :
ReBar * _pRebar; ReBar * _pRebar;
REBARBANDINFO _rbBand; REBARBANDINFO _rbBand;
//HWND _hEditBox, _hSearchPrev, _hSearchNext, _hCheckCase, _hCheckHiLiteAll;
bool _doSearchFromBegin; bool _doSearchFromBegin;
virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
void markSelectedTextInc(bool enable, FindOption *opt = NULL); void markSelectedTextInc(bool enable, FindOption *opt = NULL);

3
PowerEditor/src/stylers.model.xml
View File

@ -2,9 +2,6 @@
<NotepadPlus> <NotepadPlus>
<LexerStyles> <LexerStyles>
<LexerType name="actionscript" desc="ActionScript" ext=""> <LexerType name="actionscript" desc="ActionScript" ext="">
<!--
<WordsStyle name="DIRECTIVE" styleID="19" fgColor="A001D6" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre2" />
-->
<WordsStyle name="DEFAULT" styleID="11" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="DEFAULT" styleID="11" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
<WordsStyle name="FUNCTION" styleID="20" fgColor="95004A" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" keywordClass="type2" /> <WordsStyle name="FUNCTION" styleID="20" fgColor="95004A" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" keywordClass="type2" />
<WordsStyle name="PREPROCESSOR" styleID="9" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="PREPROCESSOR" styleID="9" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />