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 05:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix use1stLineAsTabName feature called twice while undo/redo

Browse Source 
Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16585#issuecomment-2944075642

Close #16635
This commit is contained in:
Don Ho 2025-06-05 17:08:35 +02:00
parent 1911875411
commit 0478caebf1
3 changed files with 80 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/src/Notepad_plus.h
View File

@ -194,6 +194,7 @@ public:
bool fileDelete(BufferID id = BUFFER_INVALID); bool fileDelete(BufferID id = BUFFER_INVALID);
bool fileRename(BufferID id = BUFFER_INVALID); bool fileRename(BufferID id = BUFFER_INVALID);
bool fileRenameUntitledPluginAPI(BufferID id, const wchar_t* tabNewName); bool fileRenameUntitledPluginAPI(BufferID id, const wchar_t* tabNewName);
bool useFirstLineAsTabName(BufferID id);
void unPinnedForAllBuffers(); void unPinnedForAllBuffers();
bool switchToFile(BufferID buffer); //find buffer in active view then in other view. bool switchToFile(BufferID buffer); //find buffer in active view then in other view.

76
PowerEditor/src/NppIO.cpp
View File

@ -1719,11 +1719,11 @@ bool Notepad_plus::fileCloseAllButCurrent()
return true; return true;
} }
bool Notepad_plus::fileSave(BufferID id) bool Notepad_plus::fileSave(BufferID bufferID)
{ {
BufferID bufferID = id; if (bufferID == BUFFER_INVALID)
if (id == BUFFER_INVALID)
bufferID = _pEditView->getCurrentBufferID(); bufferID = _pEditView->getCurrentBufferID();
Buffer * buf = MainFileManager.getBufferByID(bufferID); Buffer * buf = MainFileManager.getBufferByID(bufferID);
if (!buf->getFileReadOnly() && buf->isDirty()) //cannot save if readonly if (!buf->getFileReadOnly() && buf->isDirty()) //cannot save if readonly
@ -1931,11 +1931,11 @@ bool Notepad_plus::fileSaveAll()
return true; return true;
} }
bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy) bool Notepad_plus::fileSaveAs(BufferID bufferID, bool isSaveCopy)
{ {
BufferID bufferID = id; if (bufferID == BUFFER_INVALID)
if (id == BUFFER_INVALID)
bufferID = _pEditView->getCurrentBufferID(); bufferID = _pEditView->getCurrentBufferID();
Buffer * buf = MainFileManager.getBufferByID(bufferID); Buffer * buf = MainFileManager.getBufferByID(bufferID);
wstring origPathname = buf->getFullPathName(); wstring origPathname = buf->getFullPathName();
@ -2034,11 +2034,11 @@ bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy)
} }
} }
bool Notepad_plus::fileRename(BufferID id) bool Notepad_plus::fileRename(BufferID bufferID)
{ {
BufferID bufferID = id; if (bufferID == BUFFER_INVALID)
if (id == BUFFER_INVALID)
bufferID = _pEditView->getCurrentBufferID(); bufferID = _pEditView->getCurrentBufferID();
Buffer * buf = MainFileManager.getBufferByID(bufferID); Buffer * buf = MainFileManager.getBufferByID(bufferID);
SCNotification scnN{}; SCNotification scnN{};
@ -2144,6 +2144,64 @@ bool Notepad_plus::fileRename(BufferID id)
return success; return success;
} }
// Make a temporary tab name from first line of document
bool Notepad_plus::useFirstLineAsTabName(BufferID bufferID)
{
if (bufferID == BUFFER_INVALID)
return false;
Buffer* buffer = MainFileManager.getBufferByID(bufferID);
wstring content1stLineTabName = _pEditView->getLine(0);
buffer->normalizeTabName(content1stLineTabName);
if (content1stLineTabName.empty())
return false;
// check whether there is any buffer with the same name
BufferID sameNamedBufferId = _pDocTab->findBufferByName(content1stLineTabName.c_str());
if (sameNamedBufferId == BUFFER_INVALID)
sameNamedBufferId = _pNonDocTab->findBufferByName(content1stLineTabName.c_str());
if (content1stLineTabName != buffer->getFileName() && sameNamedBufferId == BUFFER_INVALID)
{
// notify tab name changing
SCNotification scnNotif{};
scnNotif.nmhdr.code = NPPN_FILEBEFORERENAME;
scnNotif.nmhdr.hwndFrom = _pPublicInterface->getHSelf();
scnNotif.nmhdr.idFrom = (uptr_t)buffer->getID();
_pluginsManager.notify(&scnNotif);
// backup old file path
wstring oldFileNamePath = buffer->getFullPathName();
// set tab name
buffer->setFileName(content1stLineTabName.c_str());
// notify tab renamed
scnNotif.nmhdr.code = NPPN_FILERENAMED;
_pluginsManager.notify(&scnNotif);
// for the backup system
wstring oldBackUpFileName = buffer->getBackupFileName();
bool isSnapshotMode = NppParameters::getInstance().getNppGUI().isSnapshotMode();
if (isSnapshotMode && !oldBackUpFileName.empty())
{
wstring newBackUpFileName = oldBackUpFileName;
newBackUpFileName.replace(newBackUpFileName.rfind(oldFileNamePath), oldFileNamePath.length(), content1stLineTabName);
if (doesFileExist(newBackUpFileName.c_str()))
::ReplaceFile(newBackUpFileName.c_str(), oldBackUpFileName.c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS | REPLACEFILE_IGNORE_ACL_ERRORS, 0, 0);
else
::MoveFileEx(oldBackUpFileName.c_str(), newBackUpFileName.c_str(), MOVEFILE_REPLACE_EXISTING);
buffer->setBackupFileName(newBackUpFileName);
}
return true;
}
return false;
}
bool Notepad_plus::fileRenameUntitledPluginAPI(BufferID id, const wchar_t* tabNewName) bool Notepad_plus::fileRenameUntitledPluginAPI(BufferID id, const wchar_t* tabNewName)
{ {
if (tabNewName == nullptr) return false; if (tabNewName == nullptr) return false;

65
PowerEditor/src/NppNotification.cpp
View File

@ -50,7 +50,19 @@ BOOL Notepad_plus::notify(SCNotification *notification)
if (notification->modificationType & (SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT)) if (notification->modificationType & (SC_MOD_DELETETEXT | SC_MOD_INSERTTEXT))
{ {
// Make temporary tab name automatically by using the 1st line of content for untitled documents
Buffer* buffer = notifyView->getCurrentBuffer();
const NewDocDefaultSettings& ndds = NppParameters::getInstance().getNppGUI().getNewDocDefaultSettings();
intptr_t curLineIndex = _pEditView->execute(SCI_LINEFROMPOSITION, notification->position);
if (curLineIndex == 0 && ndds._useContentAsTabName && buffer->isUntitled() && !buffer->isUntitledTabRenamed())
{
useFirstLineAsTabName(buffer);
}
// Hold the correct position for "Begin/End &Select" or "Begin/End Select in Column Mode" commands
_pEditView->updateBeginEndSelectPosition(notification->modificationType & SC_MOD_INSERTTEXT, notification->position, notification->length); _pEditView->updateBeginEndSelectPosition(notification->modificationType & SC_MOD_INSERTTEXT, notification->position, notification->length);
// While the text modification, we make sure the link beblow the modification will be reprocessed
_linkTriggered = true; _linkTriggered = true;
::InvalidateRect(notifyView->getHSelf(), NULL, TRUE); ::InvalidateRect(notifyView->getHSelf(), NULL, TRUE);
} }
@ -59,59 +71,6 @@ BOOL Notepad_plus::notify(SCNotification *notification)
{ {
// for the backup system // for the backup system
_pEditView->getCurrentBuffer()->setModifiedStatus(true); _pEditView->getCurrentBuffer()->setModifiedStatus(true);
// auto make temporary name for untitled documents
Buffer* buffer = notifyView->getCurrentBuffer();
const NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
const NewDocDefaultSettings& ndds = nppGui.getNewDocDefaultSettings();
intptr_t curLineIndex = _pEditView->execute(SCI_LINEFROMPOSITION, notification->position);
if (curLineIndex == 0 && ndds._useContentAsTabName && buffer->isUntitled() && !buffer->isUntitledTabRenamed())
{
// make a temporary tab name from first line of document
wstring content1stLineTabName = _pEditView->getLine(0);
buffer->normalizeTabName(content1stLineTabName);
// check whether there is any buffer with the same name
BufferID sameNamedBufferId = _pDocTab->findBufferByName(content1stLineTabName.c_str());
if (sameNamedBufferId == BUFFER_INVALID)
sameNamedBufferId = _pNonDocTab->findBufferByName(content1stLineTabName.c_str());
if (!content1stLineTabName.empty() && content1stLineTabName != buffer->getFileName() && sameNamedBufferId == BUFFER_INVALID)
{
// notify tab name changing
SCNotification scnNotif{};
scnNotif.nmhdr.code = NPPN_FILEBEFORERENAME;
scnNotif.nmhdr.hwndFrom = _pPublicInterface->getHSelf();
scnNotif.nmhdr.idFrom = (uptr_t)buffer->getID();
_pluginsManager.notify(&scnNotif);
// backup old file path
wstring oldFileNamePath = buffer->getFullPathName();
// set tab name
buffer->setFileName(content1stLineTabName.c_str());
// notify tab renamed
scnNotif.nmhdr.code = NPPN_FILERENAMED;
_pluginsManager.notify(&scnNotif);
// for the backup system
wstring oldBackUpFileName = buffer->getBackupFileName();
bool isSnapshotMode = nppGui.isSnapshotMode();
if (isSnapshotMode && !oldBackUpFileName.empty())
{
wstring newBackUpFileName = oldBackUpFileName;
newBackUpFileName.replace(newBackUpFileName.rfind(oldFileNamePath), oldFileNamePath.length(), content1stLineTabName);
if (doesFileExist(newBackUpFileName.c_str()))
::ReplaceFile(newBackUpFileName.c_str(), oldBackUpFileName.c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS | REPLACEFILE_IGNORE_ACL_ERRORS, 0, 0);
else
::MoveFileEx(oldBackUpFileName.c_str(), newBackUpFileName.c_str(), MOVEFILE_REPLACE_EXISTING);
buffer->setBackupFileName(newBackUpFileName);
}
}
}
} }
if (notification->modificationType & SC_MOD_CHANGEINDICATOR) if (notification->modificationType & SC_MOD_CHANGEINDICATOR)