Add more workaround to ensure handling the correct document

src/dllmain.cpp

@@ -75,14 +75,37 @@ extern "C" NPPAUTODETECTINDENT_API void beNotified(SCNotification *notifyCode)
 			break;
 		}
 
-		case NPPN_FILECLOSED:
+		case NPPN_FILEBEFORECLOSE:
 		{
 			TCHAR path[MAX_PATH + 1] {};
 			myPlugin->message()->sendNppMessage<>(NPPM_GETFULLCURRENTPATH, MAX_PATH, reinterpret_cast<LPARAM>(path));
 			indentCache.erase(path);
 			break;
 		}
 
+		case NPPN_FILEBEFORESAVE:
+		{
+			const uptr_t bufferId = notifyCode->nmhdr.idFrom;
+			TCHAR oldPath[MAX_PATH + 1] {};
+			myPlugin->message()->sendNppMessage<>(NPPM_GETFULLCURRENTPATH, MAX_PATH, reinterpret_cast<LPARAM>(oldPath));
+
+			myPlugin->fileRenameMap[bufferId] = oldPath;
+			break;
+		}
+
+		case NPPN_FILESAVED:
+		{
+			const uptr_t bufferId = notifyCode->nmhdr.idFrom;
+			const std::wstring oldPath = myPlugin->fileRenameMap[bufferId];
+			myPlugin->fileRenameMap.erase(bufferId);
+
+			TCHAR newPath[MAX_PATH + 1] {};
+			myPlugin->message()->sendNppMessage<>(NPPM_GETFULLCURRENTPATH, MAX_PATH, reinterpret_cast<LPARAM>(newPath));
+			indentCache[newPath] = indentCache[oldPath];
+			indentCache.erase(oldPath);
+			break;
+		}
+
 		case NPPN_BUFFERACTIVATED:
 		{
 			if (Settings::instance()->getDisablePlugin())

src/nppAutoDetectIndent.cpp

@@ -21,7 +21,7 @@
 
 #include "settings.h"
 
-#define PLUGIN_VERSION "1.5"
+#define PLUGIN_VERSION "1.6"
 
 namespace
 {

src/nppAutoDetectIndent.h

@@ -108,6 +108,7 @@ class MyPlugin
 
 		const std::array<FuncItem, 4> m_funcItems {};
 		nppAutoDetectIndent::IndentCache indentCache;
+		std::unordered_map<uptr_t, std::wstring> fileRenameMap;  // <buffer id, old file path>
 		nppAutoDetectIndent::NppSettings nppOriginalSettings;
 
 		static constexpr TCHAR *PLUGIN_NAME = TEXT("Auto Detect Indention");