CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #82 from RaiKoHoff/Bugfixes_492+

Browse Source 
fixed: RegExpr "Find previous" corrected
This commit is contained in:
Derick Payne 2017-09-08 15:16:32 +02:00 committed by GitHub
commit 5a6e6d2eda
8 changed files with 273 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Version.ps1
View File

@ -32,14 +32,19 @@ function DebugOutput($msg)
try
{
$Major = 2
$Minor = $(Get-Date -format yy)
$Revis = $(Get-Date -format Mdd)
$Build = $env:appveyor_build_number
$Minor = [int]$(Get-Date -format yy)
$Revis = [int]$(Get-Date -format Mdd)
if ($AppVeyorEnv) {
$Build = [int]($env:appveyor_build_number)
}
else {
$Build = [int](Get-Content "Versions\build.txt")
}
if (!$Build) { $Build = 0 }
$SciVer = Get-Content "scintilla\version.txt"
$SciVer = [int](Get-Content "scintilla\version.txt")
if (!$SciVer) { $SciVer = 0 }
$CompleteVer = "$Major.$Minor.$Revis.$Build"
$CompleteVer = "$Major.$Minor.$Revis.$Build"
DebugOutput("Version number: '$CompleteVer'")
Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
@ -51,7 +56,7 @@ try
Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
if ($AppVeyorEnv) {
Update-AppveyorBuild -Version $CompleteVer
Update-AppveyorBuild -Version $CompleteVer
}
}
catch
@ -63,6 +68,9 @@ catch
}
finally
{
if (-not $AppVeyorEnv) {
$Build + 1 | Set-Content "Versions\build.txt"
}
[Environment]::SetEnvironmentVariable("LASTEXITCODE", $LastExitCode, "User")
$host.SetShouldExit($LastExitCode)
Write-Host "VersionPatching: Done! Elapsed time: $($stopwatch.Elapsed)."

1
Versions/build.txt Normal file
View File

@ -0,0 +1 @@
492

375
scintilla/deelx/DeelxRegexSearch.cxx
View File

@ -29,7 +29,7 @@
#pragma warning( push )
#pragma warning( disable : 4996 ) // Scintilla's "unsafe" use of std::copy() (SplitVector.h)
// // or use -D_SCL_SECURE_NO_WARNINGS preprocessor define
// // or use -D_SCL_SECURE_NO_WARNINGS preprocessor define
#include "Platform.h"
#include "Scintilla.h"
@ -54,52 +54,52 @@ class DeelxRegexSearch : public RegexSearchBase
{
public:
explicit DeelxRegexSearch(CharClassify* charClassTable)
: m_RegExpr()
, m_Match()
, m_MatchPos(-1)
, m_MatchLength(0)
, m_pContext(nullptr)
, m_SubstitutionBuffer(nullptr)
{}
explicit DeelxRegexSearch(CharClassify* charClassTable)
: m_RegExpr()
,m_Match()
,m_MatchPos(-1)
,m_MatchLength(0)
,m_pContext(nullptr)
,m_SubstitutionBuffer(nullptr)
{}
virtual ~DeelxRegexSearch()
{
ReleaseSubstitutionBuffer();
ReleaseContext();
}
virtual ~DeelxRegexSearch()
{
ReleaseSubstitutionBuffer();
ReleaseContext();
}
virtual long FindText(Document* doc, int minPos, int maxPos, const char* pattern,
bool caseSensitive, bool word, bool wordStart, int flags, int* length) override;
virtual long FindText(Document* doc,int minPos,int maxPos,const char* pattern,
bool caseSensitive,bool word,bool wordStart,int flags,int* length) override;
virtual const char* SubstituteByPosition(Document* doc, const char* text, int* length) override;
virtual const char* SubstituteByPosition(Document* doc,const char* text,int* length) override;
private:
inline void ReleaseContext()
{
if (m_pContext != nullptr) {
m_RegExpr.ReleaseContext(m_pContext);
m_pContext = nullptr;
}
inline void ReleaseContext()
{
if (m_pContext != nullptr) {
m_RegExpr.ReleaseContext(m_pContext);
m_pContext = nullptr;
}
}
inline void ReleaseSubstitutionBuffer()
{
if (m_SubstitutionBuffer) {
m_RegExpr.ReleaseString(m_SubstitutionBuffer);
m_SubstitutionBuffer = nullptr;
}
inline void ReleaseSubstitutionBuffer()
{
if (m_SubstitutionBuffer) {
m_RegExpr.ReleaseString(m_SubstitutionBuffer);
m_SubstitutionBuffer = nullptr;
}
}
private:
deelx::CRegexpT<char> m_RegExpr;
deelx::MatchResult m_Match;
deelx::index_t m_MatchPos;
deelx::index_t m_MatchLength;
deelx::CContext* m_pContext;
char* m_SubstitutionBuffer;
deelx::CRegexpT<char> m_RegExpr;
deelx::MatchResult m_Match;
deelx::index_t m_MatchPos;
deelx::index_t m_MatchLength;
deelx::CContext* m_pContext;
char* m_SubstitutionBuffer;
};
// ============================================================================
@ -107,12 +107,12 @@ private:
#ifdef SCI_NAMESPACE
RegexSearchBase *Scintilla::CreateRegexSearch(CharClassify *charClassTable)
{
return new DeelxRegexSearch(charClassTable);
return new DeelxRegexSearch(charClassTable);
}
#else
RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable)
{
return new DeelxRegexSearch(charClassTable);
return new DeelxRegexSearch(charClassTable);
}
#endif
@ -121,7 +121,7 @@ RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable)
/**
* forward declaration of utility functions
*/
std::string& translateRegExpr(std::string& regExprStr, bool wholeWord, bool wordStart);
std::string& translateRegExpr(std::string& regExprStr,bool wholeWord,bool wordStart);
std::string& convertReplExpr(std::string& replStr);
@ -133,83 +133,92 @@ std::string& convertReplExpr(std::string& replStr);
* searches (just pass minPos > maxPos to do a backward search)
* Has not been tested with backwards DBCS searches yet.
*/
long DeelxRegexSearch::FindText(Document* doc, int minPos, int maxPos, const char *pattern,
bool caseSensitive, bool word, bool wordStart, int searchFlags, int *length)
long DeelxRegexSearch::FindText(Document* doc,int minPos,int maxPos,const char *pattern,
bool caseSensitive,bool word,bool wordStart,int searchFlags,int *length)
{
int startPos, endPos;
bool left2right;
const bool right2left = false; // always left-to-right match mode
const bool extended = false; // ignore spaces and use '#' as line-comment)
if (minPos <= maxPos) {
left2right = true;
startPos = minPos;
endPos = maxPos;
// Range endpoints should not be inside DBCS characters, but just in case, move them.
minPos = doc->MovePositionOutsideChar(minPos,1,false);
maxPos = doc->MovePositionOutsideChar(maxPos,1,false);
const bool findprevious = (minPos > maxPos);
int compileFlags = deelx::NO_FLAG;
compileFlags |= (deelx::MULTILINE | deelx::GLOBAL); // the .(dot) does not match line-breaks
//compileFlags |= (deelx::SINGLELINE | deelx::MULTILINE | deelx::GLOBAL); // the .(dot) also matches line-breaks
compileFlags |= (extended) ? deelx::EXTENDED : deelx::NO_FLAG;
compileFlags |= (!caseSensitive) ? deelx::IGNORECASE : deelx::NO_FLAG;
compileFlags |= (right2left) ? deelx::RIGHTTOLEFT : deelx::NO_FLAG;
std::string sRegExprStrg = translateRegExpr(std::string(pattern,*length),word,wordStart);
try {
m_RegExpr.Compile(sRegExprStrg.c_str(),compileFlags);
}
catch (...) {
return -2; // -1 is normally used for not found, -2 is used here for invalid regex
}
int rangeBegin = (findprevious) ? maxPos : minPos;
int rangeLength = abs(maxPos - minPos);
ReleaseContext();
m_pContext = m_RegExpr.PrepareMatch(doc->RangePointer(rangeBegin,rangeLength));
m_MatchPos = -1; // not found
m_MatchLength = 0;
m_Match = m_RegExpr.Match(m_pContext);
if (findprevious) // search previous
{
// search for last occurrence in range
while (m_Match.IsMatched() && (m_Match.GetStart() < rangeLength))
{
m_MatchPos = rangeBegin + m_Match.GetStart();
m_MatchLength = (m_Match.GetEnd() - m_Match.GetStart());
m_Match = m_RegExpr.Match(m_pContext); //next
}
else { // backward search
left2right = false;
startPos = maxPos;
endPos = minPos;
}
else
{
if (m_Match.IsMatched() && (m_Match.GetStart() < rangeLength))
{
m_MatchPos = rangeBegin + m_Match.GetStart();
m_MatchLength = (m_Match.GetEnd() - m_Match.GetStart());
}
}
// Range endpoints should not be inside DBCS characters, but just in case, move them.
startPos = doc->MovePositionOutsideChar(startPos, 1, false);
endPos = doc->MovePositionOutsideChar(endPos, 1, false);
//int compileFlags(deelx::SINGLELINE | deelx::MULTILINE | deelx::GLOBAL); // the .(dot) also matches line-breaks
int compileFlags(deelx::MULTILINE | deelx::GLOBAL); // the .(dot) does not match line-breaks
//compileFlags |= deelx::EXTENDED; // ignore spaces and use '#' as line-comment)
compileFlags |= (caseSensitive) ? deelx::NO_FLAG : deelx::IGNORECASE;
compileFlags |= (left2right) ? deelx::NO_FLAG : deelx::RIGHTTOLEFT;
std::string sRegExprStrg = translateRegExpr(std::string(pattern, *length), word, wordStart);
try {
m_RegExpr.Compile(sRegExprStrg.c_str(), compileFlags);
}
catch (...) {
return -2; // -1 is normally used for not found, -2 is used here for invalid regex
}
int rangeLen = endPos - startPos;
int searchStartPos = left2right ? 0 : rangeLen;
ReleaseContext();
m_pContext = m_RegExpr.PrepareMatch(doc->RangePointer(startPos, rangeLen), searchStartPos);
m_Match = m_RegExpr.Match(m_pContext);
m_MatchPos = -1; // not found
m_MatchLength = 0;
if (m_Match.IsMatched()) {
m_MatchPos = startPos + m_Match.GetStart();
m_MatchLength = (m_Match.GetEnd() - m_Match.GetStart());
}
//NOTE: potential 64-bit-size issue at interface here:
*length = static_cast<int>(m_MatchLength);
return static_cast<long>(m_MatchPos);
//NOTE: potential 64-bit-size issue at interface here:
*length = static_cast<int>(m_MatchLength);
return static_cast<long>(m_MatchPos);
}
// ============================================================================
const char* DeelxRegexSearch::SubstituteByPosition(Document* doc, const char* text, int* length)
const char* DeelxRegexSearch::SubstituteByPosition(Document* doc,const char* text,int* length)
{
if (!m_Match.IsMatched() || (m_MatchPos < 0)) {
*length = 0;
return nullptr;
}
std::string sReplStrg = convertReplExpr(std::string(text, *length));
if (!m_Match.IsMatched() || (m_MatchPos < 0)) {
*length = 0;
return nullptr;
}
std::string sReplStrg = convertReplExpr(std::string(text,*length));
//NOTE: potential 64-bit-size issue at interface here:
const char* pString = doc->RangePointer(static_cast<int>(m_MatchPos), static_cast<int>(m_MatchLength));
//NOTE: potential 64-bit-size issue at interface here:
const char* pString = doc->RangePointer(static_cast<int>(m_MatchPos),static_cast<int>(m_MatchLength));
deelx::index_t resLength;
ReleaseSubstitutionBuffer();
m_SubstitutionBuffer = m_RegExpr.Replace(pString, m_MatchLength, sReplStrg.c_str(),
static_cast<deelx::index_t>(sReplStrg.length()), resLength);
deelx::index_t resLength;
ReleaseSubstitutionBuffer();
m_SubstitutionBuffer = m_RegExpr.Replace(pString,m_MatchLength,sReplStrg.c_str(),
static_cast<deelx::index_t>(sReplStrg.length()),resLength);
//NOTE: potential 64-bit-size issue at interface here:
*length = static_cast<int>(resLength);
//NOTE: potential 64-bit-size issue at interface here:
*length = static_cast<int>(resLength);
return m_SubstitutionBuffer;
return m_SubstitutionBuffer;
}
// ============================================================================
@ -221,47 +230,47 @@ const char* DeelxRegexSearch::SubstituteByPosition(Document* doc, const char* te
// ============================================================================
void replaceAll(std::string& source, const std::string& from, const std::string& to)
void replaceAll(std::string& source,const std::string& from,const std::string& to)
{
std::string newString;
newString.reserve(source.length() * 2); // avoids a few memory allocations
std::string newString;
newString.reserve(source.length() * 2); // avoids a few memory allocations
std::string::size_type lastPos = 0;
std::string::size_type findPos;
std::string::size_type lastPos = 0;
std::string::size_type findPos;
while (std::string::npos != (findPos = source.find(from, lastPos))) {
newString.append(source, lastPos, findPos - lastPos);
newString += to;
lastPos = findPos + from.length();
}
// Care for the rest after last occurrence
newString += source.substr(lastPos);
while (std::string::npos != (findPos = source.find(from,lastPos))) {
newString.append(source,lastPos,findPos - lastPos);
newString += to;
lastPos = findPos + from.length();
}
// Care for the rest after last occurrence
newString += source.substr(lastPos);
source.swap(newString);
source.swap(newString);
}
// ----------------------------------------------------------------------------
std::string& translateRegExpr(std::string& regExprStr, bool wholeWord, bool wordStart)
std::string& translateRegExpr(std::string& regExprStr,bool wholeWord,bool wordStart)
{
std::string tmpStr;
std::string tmpStr;
if (wholeWord || wordStart) { // push '\b' at the begin of regexpr
tmpStr.push_back('\\');
tmpStr.push_back('b');
tmpStr.append(regExprStr);
if (wholeWord) { // push '\b' at the end of regexpr
tmpStr.push_back('\\');
tmpStr.push_back('b');
}
replaceAll(tmpStr, ".", "\\w");
if (wholeWord || wordStart) { // push '\b' at the begin of regexpr
tmpStr.push_back('\\');
tmpStr.push_back('b');
tmpStr.append(regExprStr);
if (wholeWord) { // push '\b' at the end of regexpr
tmpStr.push_back('\\');
tmpStr.push_back('b');
}
else {
tmpStr.append(regExprStr);
}
std::swap(regExprStr, tmpStr);
return regExprStr;
replaceAll(tmpStr,".","\\w");
}
else {
tmpStr.append(regExprStr);
}
std::swap(regExprStr,tmpStr);
return regExprStr;
}
// ----------------------------------------------------------------------------
@ -269,60 +278,60 @@ std::string& translateRegExpr(std::string& regExprStr, bool wholeWord, bool word
std::string& convertReplExpr(std::string& replStr)
{
std::string tmpStr;
for (size_t i = 0; i < replStr.length(); ++i) {
char ch = replStr[i];
if (ch == '\\') {
ch = replStr[++i]; // next char
if (ch == '\\') {
// skip 2nd backslash ("\\")
if (i < replStr.length()) { ch = replStr[++i]; }
else { break; }
}
if (ch >= '1' && ch <= '9') {
// former behavior convenience:
// change "\\<n>" to deelx's group reference ($<n>)
tmpStr.push_back('$');
}
switch (ch) {
// check for escape seq:
case 'a':
tmpStr.push_back('\a');
break;
case 'b':
tmpStr.push_back('\b');
break;
case 'f':
tmpStr.push_back('\f');
break;
case 'n':
tmpStr.push_back('\n');
break;
case 'r':
tmpStr.push_back('\r');
break;
case 't':
tmpStr.push_back('\t');
break;
case 'v':
tmpStr.push_back('\v');
break;
case '\\':
tmpStr.push_back('\\');
break;
default:
// unknown ctrl seq
tmpStr.push_back(ch);
break;
}
}
else {
tmpStr.push_back(ch);
}
} //for
std::string tmpStr;
for (size_t i = 0; i < replStr.length(); ++i) {
char ch = replStr[i];
if (ch == '\\') {
ch = replStr[++i]; // next char
if (ch == '\\') {
// skip 2nd backslash ("\\")
if (i < replStr.length()) { ch = replStr[++i]; }
else { break; }
}
if (ch >= '1' && ch <= '9') {
// former behavior convenience:
// change "\\<n>" to deelx's group reference ($<n>)
tmpStr.push_back('$');
}
switch (ch) {
// check for escape seq:
case 'a':
tmpStr.push_back('\a');
break;
case 'b':
tmpStr.push_back('\b');
break;
case 'f':
tmpStr.push_back('\f');
break;
case 'n':
tmpStr.push_back('\n');
break;
case 'r':
tmpStr.push_back('\r');
break;
case 't':
tmpStr.push_back('\t');
break;
case 'v':
tmpStr.push_back('\v');
break;
case '\\':
tmpStr.push_back('\\');
break;
default:
// unknown ctrl seq
tmpStr.push_back(ch);
break;
}
}
else {
tmpStr.push_back(ch);
}
} //for
std::swap(replStr, tmpStr);
return replStr;
std::swap(replStr,tmpStr);
return replStr;
}
// ============================================================================

88
src/Edit.c
View File

@ -562,8 +562,6 @@ char* EditGetClipboardText(HWND hwnd,BOOL bCheckEncoding) {
char *pmch;
char *ptmp;
int wlen,mlen,mlen2;
UINT codepage;
int eolmode;
if (!IsClipboardFormatAvailable(CF_UNICODETEXT) || !OpenClipboard(GetParent(hwnd))) {
char* pEmpty = StrDupA("");
@ -598,8 +596,7 @@ char* EditGetClipboardText(HWND hwnd,BOOL bCheckEncoding) {
}
// get clipboard
codepage = Encoding_SciGetCodePage(hwnd);
eolmode = (int)SendMessage(hwnd,SCI_GETEOLMODE,0,0);
UINT codepage = Encoding_SciGetCodePage(hwnd);
mlen = WideCharToMultiByte(codepage,0,pwch,wlen + 2,NULL,0,NULL,NULL);
pmch = LocalAlloc(LPTR,mlen + 2);
@ -616,6 +613,7 @@ char* EditGetClipboardText(HWND hwnd,BOOL bCheckEncoding) {
if (ptmp) {
char *s = pmch;
char *d = ptmp;
int eolmode = (int)SendMessage(hwnd,SCI_GETEOLMODE,0,0);
for (int i = 0; (i <= mlen) && (*s != '\0'); i++) {
if (*s == '\n' || *s == '\r') {
if (eolmode == SC_EOL_CR) {
@ -2046,10 +2044,6 @@ void EditTitleCase(HWND hwnd)
int iCurPos;
int iAnchorPos;
UINT cpEdit;
int i;
BOOL bNewWord = TRUE;
BOOL bChanged = FALSE;
BOOL bPrevWasSpace = FALSE;
iCurPos = (int)SendMessage(hwnd,SCI_GETCURRENTPOS,0,0);
iAnchorPos = (int)SendMessage(hwnd,SCI_GETANCHOR,0,0);
@ -2076,56 +2070,18 @@ void EditTitleCase(HWND hwnd)
cpEdit = Encoding_SciGetCodePage(hwnd);
cchTextW = MultiByteToWideChar(cpEdit,0,pszText,iSelLength,pszTextW,iSelLength);
if (IsWin7()) {
BOOL bChanged = FALSE;
LPWSTR pszMappedW = LocalAlloc(LPTR,GlobalSize(pszTextW));
if (LCMapString(LOCALE_SYSTEM_DEFAULT,LCMAP_LINGUISTIC_CASING|LCMAP_TITLECASE,
pszTextW,cchTextW,pszMappedW,iSelLength)) {
StringCchCopyN(pszTextW,iSelLength,pszMappedW,iSelLength);
LPWSTR pszMappedW = LocalAlloc(LPTR,GlobalSize(pszTextW));
// first make lower case, before applying TitleCase
if (LCMapString(LOCALE_SYSTEM_DEFAULT,LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE,
pszTextW,cchTextW,pszMappedW,iSelLength)) {
if (LCMapString(LOCALE_SYSTEM_DEFAULT,LCMAP_TITLECASE,
pszMappedW,cchTextW,pszTextW,iSelLength)) {
bChanged = TRUE;
}
else
bChanged = FALSE;
LocalFree(pszMappedW);
}
else {
// Slightly enhanced function to make Title Case:
// Added some '-characters and bPrevWasSpace makes it better (for example "'Don't'" will now work)
bPrevWasSpace = TRUE;
for (i = 0; i < cchTextW; i++)
{
if (!IsCharAlphaNumericW(pszTextW[i]) && (!StrChr(L"'`΄’",pszTextW[i]) || bPrevWasSpace ) )
{
bNewWord = TRUE;
}
else
{
if (bNewWord)
{
if (IsCharLowerW(pszTextW[i]))
{
pszTextW[i] = LOWORD(CharUpperW((LPWSTR)(SIZE_T)MAKELONG(pszTextW[i],0)));
bChanged = TRUE;
}
}
else
{
if (IsCharUpperW(pszTextW[i]))
{
pszTextW[i] = LOWORD(CharLowerW((LPWSTR)(SIZE_T)MAKELONG(pszTextW[i],0)));
bChanged = TRUE;
}
}
bNewWord = FALSE;
}
if( StrChr(L" \r\n\t[](){}",pszTextW[i]) ) bPrevWasSpace = TRUE; else bPrevWasSpace = FALSE;
}
}
LocalFree(pszMappedW);
if (bChanged) {
@ -5937,8 +5893,10 @@ struct WLIST {
struct WLIST* next;
};
void CompleteWord(HWND hwnd, BOOL autoInsert) {
const char* NON_WORD = " \t\r\n@#$%^&*~-=+()[]{}\\/.,:;'\"!?<>`|";
void CompleteWord(HWND hwnd, BOOL autoInsert)
{
const char* NON_WORD = DelimChars;
int iCurrentPos = (int)SendMessage(hwnd, SCI_GETCURRENTPOS, 0, 0);
int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, iCurrentPos, 0);
int iCurrentLinePos = iCurrentPos - (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, (WPARAM)iLine, 0);
@ -5971,11 +5929,11 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
return;
}
int cnt = iCurrentLinePos - iStartWordPos + 2;
pRoot = LocalAlloc(LPTR,cnt);
StringCchCopyNA(pRoot,cnt,pLine + iStartWordPos,cnt-1);
int cnt = iCurrentLinePos - iStartWordPos;
pRoot = LocalAlloc(LPTR,cnt+1);
StringCchCopyNA(pRoot,cnt+1,pLine + iStartWordPos,cnt);
LocalFree(pLine);
iRootLen = _StringCchLenNA(pRoot,cnt);
iRootLen = _StringCchLenNA(pRoot,cnt+1);
iDocLen = (int)SendMessage(hwnd, SCI_GETLENGTH, 0, 0);
@ -5999,7 +5957,7 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
//int lastCmp = 0;
BOOL found = FALSE;
pWord = LocalAlloc(LPTR,wordLength + 2);
pWord = LocalAlloc(LPTR,wordLength + 1);
tr.lpstrText = pWord;
tr.chrg.cpMin = iPosFind;
@ -6007,7 +5965,7 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
SendMessage(hwnd, SCI_GETTEXTRANGE, 0, (LPARAM)&tr);
while(p) {
int cmp = StringCchCompareNA(pWord,wordLength + 2, p->word,-1);
int cmp = StringCchCompareNA(pWord,wordLength + 1, p->word,-1);
if (cmp == 0) {
found = TRUE;
break;
@ -6019,8 +5977,8 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
}
if (!found) {
struct WLIST* el = (struct WLIST*)LocalAlloc(LPTR, sizeof(struct WLIST));
el->word = LocalAlloc(LPTR,wordLength + 2);
StringCchCopyA(el->word,wordLength + 2,pWord);
el->word = LocalAlloc(LPTR,wordLength + 1);
StringCchCopyA(el->word,wordLength + 1,pWord);
el->next = p;
if (t) {
t->next = el;
@ -6029,7 +5987,7 @@ void CompleteWord(HWND hwnd, BOOL autoInsert) {
}
iNumWords++;
iWListSize += _StringCchLenNA(pWord,wordLength + 2) + 1;
iWListSize += _StringCchLenNA(pWord,wordLength + 1) + 1;
}
LocalFree(pWord);
}

24
src/Notepad3.c
View File

@ -4584,13 +4584,34 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
break;
// Newline with toggled auto indent setting
case CMD_CTRLENTER:
{
int token = BeginSelUndoAction();
int iPos = (int)SendMessage(hwndEdit,SCI_GETCURRENTPOS,0,0);
int iLine = (int)SendMessage(hwndEdit,SCI_LINEFROMPOSITION,(WPARAM)iPos,0);
if (iLine <= 0) {
SendMessage(hwndEdit,SCI_GOTOLINE,0,0);
SendMessage(hwndEdit,SCI_NEWLINE,0,0);
SendMessage(hwndEdit,SCI_GOTOLINE,0,0);
}
else {
SendMessage(hwndEdit,SCI_GOTOPOS,
SendMessage(hwndEdit,SCI_GETLINEENDPOSITION,(WPARAM)(iLine - 1),0),0);
SendMessage(hwndEdit,SCI_NEWLINE,0,0);
}
EndSelUndoAction(token);
}
break;
// Newline with toggled auto indent setting
case CMD_SHIFTCTRLENTER:
bAutoIndent = (bAutoIndent) ? 0 : 1;
SendMessage(hwndEdit,SCI_NEWLINE,0,0);
bAutoIndent = (bAutoIndent) ? 0 : 1;
break;
case CMD_DEL:
{
int token = BeginSelUndoAction();
@ -4599,6 +4620,7 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
}
break;
case CMD_BACK:
{
int token = BeginSelUndoAction();

BIN
src/Notepad3.rc
View File

Binary file not shown.

42
src/Version.h
View File

@ -55,39 +55,31 @@
#endif
// Compiler specific
#if defined(WDK_BUILD)
#if _MSC_VER == 1600
#if (_MSC_FULL_VER >= 160040219)
#define VER_CPL "WDK (MSVC 2010 SP1)"
#if defined(_MSC_VER)
#if _MSC_VER >= 1911
#if (_MSC_FULL_VER >= 191125506)
#define VER_CPL "Microsoft Visual C++ 2017 Version 15.3"
#else
#define VER_CPL "WDK (MSVC 2010)"
#endif
#elif _MSC_VER == 1500
#if (_MSC_FULL_VER == 150030729)
#define VER_CPL "WDK"
#else
#define VER_CPL "WDK (version unknown)"
#endif
#endif
#elif defined(_MSC_VER)
#if _MSC_VER >= 1910
#if (_MSC_FULL_VER >= 191025017)
#define VER_CPL "Microsoft Visual C++ 2017"
#endif
#elif _MSC_VER >= 1910
#if (_MSC_FULL_VER >= 191025017)
#define VER_CPL "Microsoft Visual C++ 2017"
#else
#define VER_CPL "Microsoft Visual C++ 2017 RC"
#endif
#elif _MSC_VER == 1900
#if (_MSC_FULL_VER == 190024213)
#define VER_CPL "Microsoft Visual C++ 2015 Update 3"
#elif (_MSC_FULL_VER == 190023918)
#define VER_CPL "Microsoft Visual C++ 2015 Update 2"
#elif (_MSC_FULL_VER == 190023506)
#define VER_CPL "Microsoft Visual C++ 2015 Update 1"
#elif (_MSC_FULL_VER == 190023026)
#define VER_CPL "Microsoft Visual C++ 2015"
#if (_MSC_FULL_VER >= 190024213)
#define VER_CPL "Microsoft Visual C++ 2015 Update 3"
#elif (_MSC_FULL_VER >= 190023918)
#define VER_CPL "Microsoft Visual C++ 2015 Update 2"
#elif (_MSC_FULL_VER >= 190023506)
#define VER_CPL "Microsoft Visual C++ 2015 Update 1"
#else
#define VER_CPL "Microsoft Visual C++ 2015"
#endif
#else
#define VER_CPL "Microsoft Visual C++ (version unknown)"
#define VER_CPL "Microsoft Visual C++ (version unknown)"
#endif
#else
#define VER_CPL "(Unknown compiler)"

3
src/resource.h
View File

@ -170,7 +170,7 @@
#define IDS_WILDCARDHELP 10021
#define CMD_ESCAPE 20000
#define CMD_SHIFTESC 20001
#define CMD_CTRLENTER 20002
#define CMD_SHIFTCTRLENTER 20002
#define CMD_CTRLLEFT 20003
#define CMD_CTRLRIGHT 20004
#define CMD_BACK 20005
@ -208,6 +208,7 @@
#define CMD_COPYWINPOS 20037
#define CMD_DEFAULTWINPOS 20038
#define CMD_OPENINIFILE 20039
#define CMD_CTRLENTER 20040
#define IDM_FILE_NEW 40000
#define IDM_FILE_OPEN 40001
#define IDM_FILE_REVERT 40002