From f7923c22744ae783ad94b64a76105f4fbd4d6c51 Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Fri, 13 Oct 2023 14:23:28 +0200
Subject: [PATCH] ide: Separator file properties disabled

---
 uppsrc/Sql/Script.cpp  | 4 +++-
 uppsrc/ide/UppDlg.h    | 1 +
 uppsrc/ide/UppWspc.cpp | 5 +++++
 uppsrc/ide/idebar.cpp  | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/uppsrc/Sql/Script.cpp b/uppsrc/Sql/Script.cpp
index 2898bd6e3..d73312eb5 100644
--- a/uppsrc/Sql/Script.cpp
+++ b/uppsrc/Sql/Script.cpp
@@ -37,8 +37,10 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
 			if(!esc) {
 				if(id == "BEGIN")
 					level++;
-				if(id == "END")
+				if(id == "END") {
 					level--;
+					stmt.Cat(';');
+				}
 			}
 		}
 		else
diff --git a/uppsrc/ide/UppDlg.h b/uppsrc/ide/UppDlg.h
index 5affdc18d..c4f549227 100644
--- a/uppsrc/ide/UppDlg.h
+++ b/uppsrc/ide/UppDlg.h
@@ -355,6 +355,7 @@ struct WorkspaceWork {
 	Package::File& ActiveFile();
 	String         FileName(int i) const;
 	bool           IsSeparator(int i) const;
+	bool           IsActiveSeparator() const;
 
 	void LoadActualPackage();
 	void SaveLoadPackage(bool sel = true);
diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
index 4ac86b015..bf30be302 100644
--- a/uppsrc/ide/UppWspc.cpp
+++ b/uppsrc/ide/UppWspc.cpp
@@ -393,6 +393,11 @@ bool   WorkspaceWork::IsActiveFile() const
 	return i >= 0 && i < fileindex.GetCount() && fileindex[i] < actual.file.GetCount();
 }
 
+bool WorkspaceWork::IsActiveSeparator() const
+{
+	return IsSeparator(filelist.GetCursor());
+}
+
 Package::File& WorkspaceWork::ActiveFile()
 {
 	return actual.file[fileindex[filelist.GetCursor()]];
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 3539f3850..8400af45f 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -526,16 +526,16 @@ void Ide::Project(Bar& menu)
 
 void Ide::FilePropertiesMenu0(Bar& menu)
 {
-	menu.Add(IsActiveFile(), AK_FILEPROPERTIES, THISBACK(FileProperties))
+	menu.Add(IsActiveFile() && !IsActiveSeparator(), AK_FILEPROPERTIES, THISBACK(FileProperties))
 		.Help("File properties stored in package");
 }
 
 void Ide::FilePropertiesMenu(Bar& menu)
 {
 	FilePropertiesMenu0(menu);
-	menu.Add(IsActiveFile() && !designer, AK_SAVEENCODING, THISBACK(ChangeCharset))
+	bool candiff = IsActiveFile() && !editfile_isfolder && !designer && !IsActiveSeparator();
+	menu.Add(candiff, AK_SAVEENCODING, THISBACK(ChangeCharset))
 	    .Help("Convert actual file to different encoding");
-	bool candiff = IsActiveFile() && !editfile_isfolder && !designer;
 	String path;
 	int i = filelist.GetCursor() + 1;
 	if(i >= 0 && i < fileindex.GetCount() && fileindex[i] < actual.file.GetCount())