[Scummvm-git-logs] scummvm master -> ab58eb8f73ad08a18e14e3b1d1065e2beabf0620

[scemino]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0a195013d DIRECTOR: Fix syntax highlighting with globals
ab58eb8f73 DIRECTOR: Fix invalid handler end offset


Commit: c0a195013dcbf89eaf7005ad05689af7b289e8bc
    https://github.com/scummvm/scummvm/commit/c0a195013dcbf89eaf7005ad05689af7b289e8bc
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-24T18:27:59+02:00

Commit Message:
DIRECTOR: Fix syntax highlighting with globals

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 715bd113925..21ca9e4ca12 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -1376,27 +1376,27 @@ private:
 		}
 
 		bool isMethod = _script.isMethod;
-		{
-			write(node._startOffset, isMethod ? "method " : "on ", _state->_colors._keyword_color);
-			ImGui::SameLine();
-			ImGui::TextColored(_state->_colors._call_color, "%s", _script.handlerId.c_str());
-			ImGui::SameLine();
+		write(node._startOffset, isMethod ? "method " : "on ", _state->_colors._keyword_color);
+		ImGui::SameLine();
+		ImGui::TextColored(_state->_colors._call_color, "%s", _script.handlerId.c_str());
+		ImGui::SameLine();
 
-			if (!_script.argumentNames.empty()) {
-				ImGui::Text(" ");
-				ImGui::SameLine();
-				for (size_t i = 0; i < _script.argumentNames.size(); i++) {
-					if (i > 0) {
-						ImGui::Text(", ");
-						ImGui::SameLine();
-					}
-					ImGui::TextColored(_state->_colors._var_color, "%s", _script.argumentNames[i].c_str());
+		if (!_script.argumentNames.empty()) {
+			ImGui::Text(" ");
+			ImGui::SameLine();
+			for (size_t i = 0; i < _script.argumentNames.size(); i++) {
+				if (i > 0) {
+					ImGui::Text(", ");
 					ImGui::SameLine();
 				}
+				ImGui::TextColored(_state->_colors._var_color, "%s", _script.argumentNames[i].c_str());
+				ImGui::SameLine();
 			}
 		}
+		indent();
 
 		if (isMethod && !_script.propertyNames.empty() && node.handler == &node.handler->script->handlers[0]) {
+			ImGui::NewLine();
 			write(node._startOffset, "instance ");
 			ImGui::SameLine();
 			for (size_t i = 0; i < _script.propertyNames.size(); i++) {
@@ -1409,6 +1409,7 @@ private:
 		}
 
 		if (!_script.globalNames.empty()) {
+			ImGui::NewLine();
 			write(node._startOffset, "global ");
 			ImGui::SameLine();
 			for (size_t i = 0; i < _script.globalNames.size(); i++) {
@@ -1420,8 +1421,9 @@ private:
 				ImGui::SameLine();
 			}
 		}
-		ImGui::NewLine();
 
+		ImGui::NewLine();
+		unindent();
 		node.block->accept(*this);
 
 		if (!isMethod) {


Commit: ab58eb8f73ad08a18e14e3b1d1065e2beabf0620
    https://github.com/scummvm/scummvm/commit/ab58eb8f73ad08a18e14e3b1d1065e2beabf0620
Author: scemino (scemino74 at gmail.com)
Date: 2024-05-24T18:27:59+02:00

Commit Message:
DIRECTOR: Fix invalid handler end offset

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 21ca9e4ca12..e67e6809bb0 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -1427,7 +1427,7 @@ private:
 		node.block->accept(*this);
 
 		if (!isMethod) {
-			write(node.block->_endOffset, "end", _state->_colors._keyword_color);
+			write(node._endOffset, "end", _state->_colors._keyword_color);
 		}
 	}