Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix indent guideline bug regarding Python-like languages and non-Python-likes ones

Browse Source
This commit is contained in:
Don HO 2019-10-07 00:45:16 +02:00
parent 445dc5ebc1
commit 29919bea22
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -1242,19 +1242,6 @@ void ScintillaEditView::setLexer(int lexerID, LangType langType, int whichList)
execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold"), reinterpret_cast<LPARAM>("1")); execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold"), reinterpret_cast<LPARAM>("1"));
execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold.compact"), reinterpret_cast<LPARAM>("0")); execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold.compact"), reinterpret_cast<LPARAM>("0"));
execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold.comment"), reinterpret_cast<LPARAM>("1")); execute(SCI_SETPROPERTY, reinterpret_cast<WPARAM>("fold.comment"), reinterpret_cast<LPARAM>("1"));
ScintillaViewParams & svp = (ScintillaViewParams &)NppParameters::getInstance().getSVP();
if (svp._indentGuideLineShow)
{
const auto currentIndentMode = execute(SCI_GETINDENTATIONGUIDES);
// Python like indentation, excludes lexers (Nim, VB, YAML, etc.)
// that includes tailing empty or whitespace only lines in folding block.
const bool pythonLike = (lexerID == SCLEX_PYTHON || lexerID == SCLEX_COFFEESCRIPT || lexerID == SCLEX_HASKELL);
const int docIndentMode = pythonLike ? SC_IV_LOOKFORWARD : SC_IV_LOOKBOTH;
if (currentIndentMode != docIndentMode)
execute(SCI_SETINDENTATIONGUIDES, docIndentMode);
}
} }
void ScintillaEditView::makeStyle(LangType language, const TCHAR **keywordArray) void ScintillaEditView::makeStyle(LangType language, const TCHAR **keywordArray)
@ -1762,11 +1749,17 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
setSpecialStyle(styleLN); setSpecialStyle(styleLN);
} }
setTabSettings(NppParameters::getInstance().getLangFromID(typeDoc)); setTabSettings(NppParameters::getInstance().getLangFromID(typeDoc));
/*
execute(SCI_SETSTYLEBITS, 8); // Always use 8 bit mask in Document class (Document::stylingBitsMask), if (svp._indentGuideLineShow)
// in that way Editor::PositionIsHotspot will return correct hotspot styleID. {
// This value has no effect on LexAccessor::mask. const auto currentIndentMode = execute(SCI_GETINDENTATIONGUIDES);
*/ // Python like indentation, excludes lexers (Nim, VB, YAML, etc.)
// that includes tailing empty or whitespace only lines in folding block.
const bool pythonLike = (typeDoc == L_PYTHON || typeDoc == L_COFFEESCRIPT || typeDoc == L_HASKELL);
const int docIndentMode = pythonLike ? SC_IV_LOOKFORWARD : SC_IV_LOOKBOTH;
if (currentIndentMode != docIndentMode)
execute(SCI_SETINDENTATIONGUIDES, docIndentMode);
}
} }
BufferID ScintillaEditView::attachDefaultDoc() BufferID ScintillaEditView::attachDefaultDoc()
@ -2558,7 +2551,16 @@ void ScintillaEditView::performGlobalStyles()
execute(SCI_SETWHITESPACEFORE, true, wsSymbolFgColor); execute(SCI_SETWHITESPACEFORE, true, wsSymbolFgColor);
} }
void ScintillaEditView::setLineIndent(int line, int indent) const { void ScintillaEditView::showIndentGuideLine(bool willBeShowed)
{
auto typeDoc = _currentBuffer->getLangType();
const bool pythonLike = (typeDoc == L_PYTHON || typeDoc == L_COFFEESCRIPT || typeDoc == L_HASKELL);
const int docIndentMode = pythonLike ? SC_IV_LOOKFORWARD : SC_IV_LOOKBOTH;
execute(SCI_SETINDENTATIONGUIDES, willBeShowed ? docIndentMode : SC_IV_NONE);
}
void ScintillaEditView::setLineIndent(int line, int indent) const
{
if (indent < 0) if (indent < 0)
return; return;
Sci_CharacterRange crange = getSelection(); Sci_CharacterRange crange = getSelection();

4
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -391,9 +391,7 @@ public:
return (execute(SCI_GETVIEWWS) != 0); return (execute(SCI_GETVIEWWS) != 0);
}; };
void showIndentGuideLine(bool willBeShowed = true) { void showIndentGuideLine(bool willBeShowed = true);
execute(SCI_SETINDENTATIONGUIDES, willBeShowed ? SC_IV_LOOKBOTH : SC_IV_NONE);
};
bool isShownIndentGuide() const { bool isShownIndentGuide() const {
return (execute(SCI_GETINDENTATIONGUIDES) != 0); return (execute(SCI_GETINDENTATIONGUIDES) != 0);