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

Fix "Reload from disk" loosing syntax highlighting regression

Browse Source 
In Scintilla4 reloaded document keeps its syntax highlighting without re-applying the lexer for its syntax highlighting.
It seems the behaviour has been changed in Scintilla5. Hence this workaround to force to apply syntax highlighting after reloading.

Fix #11606, close #11610
This commit is contained in:
Don Ho 2022-04-29 15:42:29 +02:00
parent 77fcedbd19
commit 9cc01de97c
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/Notepad_plus.cpp
View File

@ -4399,7 +4399,7 @@ void Notepad_plus::docGotoAnotherEditView(FileTransferMode mode)
} }
} }
bool Notepad_plus::activateBuffer(BufferID id, int whichOne) bool Notepad_plus::activateBuffer(BufferID id, int whichOne, bool forceApplyHilite)
{ {
NppGUI& nppGui = NppParameters::getInstance().getNppGUI(); NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
bool isSnapshotMode = nppGui.isSnapshotMode(); bool isSnapshotMode = nppGui.isSnapshotMode();
@ -4420,7 +4420,7 @@ bool Notepad_plus::activateBuffer(BufferID id, int whichOne)
if (_mainDocTab.activateBuffer(id)) //only activate if possible if (_mainDocTab.activateBuffer(id)) //only activate if possible
{ {
_isFolding = true; _isFolding = true;
_mainEditView.activateBuffer(id); _mainEditView.activateBuffer(id, forceApplyHilite);
_isFolding = false; _isFolding = false;
} }
else else
@ -4431,7 +4431,7 @@ bool Notepad_plus::activateBuffer(BufferID id, int whichOne)
if (_subDocTab.activateBuffer(id)) if (_subDocTab.activateBuffer(id))
{ {
_isFolding = true; _isFolding = true;
_subEditView.activateBuffer(id); _subEditView.activateBuffer(id, forceApplyHilite);
_isFolding = false; _isFolding = false;
} }
else else

2
PowerEditor/src/Notepad_plus.h
View File

@ -451,7 +451,7 @@ private:
void loadBufferIntoView(BufferID id, int whichOne, bool dontClose = false); //Doesnt _activate_ the buffer void loadBufferIntoView(BufferID id, int whichOne, bool dontClose = false); //Doesnt _activate_ the buffer
bool removeBufferFromView(BufferID id, int whichOne); //Activates alternative of possible, or creates clean document if not clean already bool removeBufferFromView(BufferID id, int whichOne); //Activates alternative of possible, or creates clean document if not clean already
bool activateBuffer(BufferID id, int whichOne); //activate buffer in that view if found bool activateBuffer(BufferID id, int whichOne, bool forceApplyHilite = false); //activate buffer in that view if found
void notifyBufferActivated(BufferID bufid, int view); void notifyBufferActivated(BufferID bufid, int view);
void performPostReload(int whichOne); void performPostReload(int whichOne);
//END: Document management //END: Document management

2
PowerEditor/src/NppIO.cpp
View File

@ -522,7 +522,7 @@ bool Notepad_plus::doReload(BufferID id, bool alert)
// Once reload is complete, activate buffer which will take care of // Once reload is complete, activate buffer which will take care of
// many settings such as update status bar, clickable link etc. // many settings such as update status bar, clickable link etc.
activateBuffer(id, currentView()); activateBuffer(id, currentView(), true);
return res; return res;
} }

1
PowerEditor/src/ScintillaComponent/Buffer.h
View File

@ -64,7 +64,6 @@ class FileManager final {
public: public:
void init(Notepad_plus* pNotepadPlus, ScintillaEditView* pscratchTilla); void init(Notepad_plus* pNotepadPlus, ScintillaEditView* pscratchTilla);
//void activateBuffer(int index);
void checkFilesystemChanges(bool bCheckOnlyCurrentBuffer); void checkFilesystemChanges(bool bCheckOnlyCurrentBuffer);
size_t getNbBuffers() const { return _nbBufs; }; size_t getNbBuffers() const { return _nbBufs; };

4
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -1903,11 +1903,11 @@ bool ScintillaEditView::setLexerFromLangID(int langID) // Internal lexer only
} }
void ScintillaEditView::activateBuffer(BufferID buffer) void ScintillaEditView::activateBuffer(BufferID buffer, bool force)
{ {
if (buffer == BUFFER_INVALID) if (buffer == BUFFER_INVALID)
return; return;
if (buffer == _currentBuffer) if (!force && buffer == _currentBuffer)
return; return;
Buffer * newBuf = MainFileManager.getBufferByID(buffer); Buffer * newBuf = MainFileManager.getBufferByID(buffer);

2
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
View File

@ -222,7 +222,7 @@ public:
} }
}; };
void activateBuffer(BufferID buffer); void activateBuffer(BufferID buffer, bool force = false);
void getCurrentFoldStates(std::vector<size_t> & lineStateVector); void getCurrentFoldStates(std::vector<size_t> & lineStateVector);
void syncFoldStateWith(const std::vector<size_t> & lineStateVectorNew); void syncFoldStateWith(const std::vector<size_t> & lineStateVectorNew);