Skip to content

Commit

Permalink
Fix converting space to tab (and vice versa) broken.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zufuliu
zufuliu committed Nov 26, 2018
1 parent d7499a4 commit 9ff1ea0
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
1 change: 1 addition & 0 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
* [RL Vision](http://www.rlvision.com/notepad2/about.asp)
* Aleksandar Lekov
* Bruno Barbieri
* Homam
* Everyone else on [GitHub](https://github.com/zufuliu/notepad2/graphs/contributors)

## More information:
Expand Down
40 changes: 19 additions & 21 deletions src/Edit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,9 @@ BOOL EditConvertText(HWND hwnd, UINT cpSource, UINT cpDest, BOOL bSetSavePoint)
SendMessage(hwnd, SCI_SETSAVEPOINT, 0, 0);
}
} else {
// DBCS: length -> WCHAR: sizeof(WCHAR) * (length / 2) -> UTF-8: kMaxMultiByteCount * (length / 2)
struct Sci_TextRange tr = { { 0, -1 }, NULL };
char *pchText = NP2HeapAlloc(length * sizeof(WCHAR) + 1);
char *pchText = NP2HeapAlloc((length + 1) * sizeof(WCHAR));
tr.lpstrText = pchText;
SendMessage(hwnd, SCI_GETTEXTRANGE, 0, (LPARAM)&tr);

Expand Down Expand Up @@ -1848,10 +1849,10 @@ void EditTabsToSpaces(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
const int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, iSelStart, 0);
iSelStart = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, iLine, 0);

const int iSelCount = (int)SendMessage(hwnd, SCI_GETSELTEXT, 0, 0);
const int iSelCount = iSelEnd - iSelStart;

char *pszText = NP2HeapAlloc(iSelCount);
LPWSTR pszTextW = NP2HeapAlloc(iSelCount * sizeof(WCHAR));
char *pszText = NP2HeapAlloc(iSelCount + 1);
LPWSTR pszTextW = NP2HeapAlloc((iSelCount + 1) * sizeof(WCHAR));

struct Sci_TextRange tr;
tr.chrg.cpMin = iSelStart;
Expand All @@ -1860,7 +1861,7 @@ void EditTabsToSpaces(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
SendMessage(hwnd, SCI_GETTEXTRANGE, 0, (LPARAM)&tr);

const UINT cpEdit = (UINT)SendMessage(hwnd, SCI_GETCODEPAGE, 0, 0);
const int cchTextW = MultiByteToWideChar(cpEdit, 0, pszText, iSelCount - 1, pszTextW,
const int cchTextW = MultiByteToWideChar(cpEdit, 0, pszText, iSelCount, pszTextW,
(int)NP2HeapSize(pszTextW) / sizeof(WCHAR));
NP2HeapFree(pszText);

Expand Down Expand Up @@ -1898,7 +1899,6 @@ void EditTabsToSpaces(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {

const int cchConvM = WideCharToMultiByte(cpEdit, 0, pszConvW, cchConvW, pszText,
(int)NP2HeapSize(pszText), NULL, NULL);
NP2HeapFree(pszConvW);

if (iAnchorPos > iCurPos) {
iCurPos = iSelStart;
Expand All @@ -1918,9 +1918,9 @@ void EditTabsToSpaces(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
SendMessage(hwnd, SCI_ENDUNDOACTION, 0, 0);

NP2HeapFree(pszText);
} else {
NP2HeapFree(pszConvW);
}

NP2HeapFree(pszConvW);
}

//=============================================================================
Expand All @@ -1944,10 +1944,10 @@ void EditSpacesToTabs(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
const int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, iSelStart, 0);
iSelStart = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, iLine, 0);

const int iSelCount = (int)SendMessage(hwnd, SCI_GETSELTEXT, 0, 0);
const int iSelCount = iSelEnd - iSelStart;

char *pszText = NP2HeapAlloc(iSelCount);
LPWSTR pszTextW = NP2HeapAlloc(iSelCount * sizeof(WCHAR));
char *pszText = NP2HeapAlloc(iSelCount + 1);
LPWSTR pszTextW = NP2HeapAlloc((iSelCount + 1) * sizeof(WCHAR));

struct Sci_TextRange tr;
tr.chrg.cpMin = iSelStart;
Expand All @@ -1957,7 +1957,7 @@ void EditSpacesToTabs(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {

const UINT cpEdit = (UINT)SendMessage(hwnd, SCI_GETCODEPAGE, 0, 0);

const int cchTextW = MultiByteToWideChar(cpEdit, 0, pszText, iSelCount - 1, pszTextW,
const int cchTextW = MultiByteToWideChar(cpEdit, 0, pszText, iSelCount, pszTextW,
(int)NP2HeapSize(pszTextW) / sizeof(WCHAR));
NP2HeapFree(pszText);

Expand Down Expand Up @@ -2013,7 +2013,6 @@ void EditSpacesToTabs(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
pszText = NP2HeapAlloc(cchConvW * kMaxMultiByteCount + 1);
const int cchConvM = WideCharToMultiByte(cpEdit, 0, pszConvW, cchConvW, pszText,
(int)NP2HeapSize(pszText), NULL, NULL);
NP2HeapFree(pszConvW);

if (iAnchorPos > iCurPos) {
iCurPos = iSelStart;
Expand All @@ -2033,9 +2032,9 @@ void EditSpacesToTabs(HWND hwnd, int nTabWidth, BOOL bOnlyIndentingWS) {
SendMessage(hwnd, SCI_ENDUNDOACTION, 0, 0);

NP2HeapFree(pszText);
} else {
NP2HeapFree(pszConvW);
}

NP2HeapFree(pszConvW);
}

//=============================================================================
Expand Down Expand Up @@ -3510,8 +3509,8 @@ void EditWrapToColumn(HWND hwnd, int nColumn/*, int nTabWidth*/) {
const int iLine = (int)SendMessage(hwnd, SCI_LINEFROMPOSITION, iSelStart, 0);
iSelStart = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, iLine, 0);

char *pszText = NP2HeapAlloc((iSelCount) + 2);
LPWSTR pszTextW = NP2HeapAlloc((iSelCount * 2) + 2);
char *pszText = NP2HeapAlloc(iSelCount + 1 + 2);
LPWSTR pszTextW = NP2HeapAlloc((iSelCount + 1 + 2) * sizeof(WCHAR));

struct Sci_TextRange tr;
tr.chrg.cpMin = iSelStart;
Expand Down Expand Up @@ -3627,7 +3626,6 @@ void EditWrapToColumn(HWND hwnd, int nColumn/*, int nTabWidth*/) {
pszText = NP2HeapAlloc(cchConvW * kMaxMultiByteCount);
const int cchConvM = WideCharToMultiByte(cpEdit, 0, pszConvW, cchConvW, pszText,
(int)NP2HeapSize(pszText), NULL, NULL);
NP2HeapFree(pszConvW);

if (iAnchorPos > iCurPos) {
iCurPos = iSelStart;
Expand All @@ -3649,9 +3647,9 @@ void EditWrapToColumn(HWND hwnd, int nColumn/*, int nTabWidth*/) {
SendMessage(hwnd, SCI_ENDUNDOACTION, 0, 0);

NP2HeapFree(pszText);
} else {
NP2HeapFree(pszConvW);
}

NP2HeapFree(pszConvW);
}

//=============================================================================
Expand All @@ -3675,7 +3673,7 @@ void EditJoinLinesEx(HWND hwnd) {
iSelStart = (int)SendMessage(hwnd, SCI_POSITIONFROMLINE, iLine, 0);

const int iSelCount = iSelEnd - iSelStart;
char *pszText = NP2HeapAlloc(iSelCount + 2);
char *pszText = NP2HeapAlloc(iSelCount + 1 + 2);
char *pszJoin = NP2HeapAlloc(NP2HeapSize(pszText));

struct Sci_TextRange tr;
Expand Down

0 comments on commit 9ff1ea0

Please sign in to comment.