escoria updateHEADmain

4 files changed, 17 insertions, 19 deletions

diff --git a/addons/escoria-core/tools/script_analysis/analyzers/esc_exit_scene_script_analyzer.gd b/addons/escoria-core/tools/script_analysis/analyzers/esc_exit_scene_script_analyzer.gd
index 3ed0025..038d3f2 100644
--- a/addons/escoria-core/tools/script_analysis/analyzers/esc_exit_scene_script_analyzer.gd
+++ b/addons/escoria-core/tools/script_analysis/analyzers/esc_exit_scene_script_analyzer.gd
@@ -1,5 +1,5 @@
-extends ESCScriptAnalyzer
 class_name ESCExitSceneScriptAnalyzer
+extends ESCScriptAnalyzer
 
 
 const EXIT_SCENE_EVENT_NAME = "exit_scene"
@@ -18,9 +18,9 @@ const BULLET_CHARACTER = "- "
 
 
 # These are vars because they have to be, but should be treated as consts
-var TRANSITION_COMMAND_NAME = TransitionCommand.new().get_command_name()
-var CHANGE_SCENE_COMMAND_NAME = ChangeSceneCommand.new().get_command_name()
-var ACCEPT_INPUT_COMMAND_NAME = AcceptInputCommand.new().get_command_name()
+var transition_command_name = TransitionCommand.new().get_command_name()
+var change_scene_command_name = ChangeSceneCommand.new().get_command_name()
+var accept_input_command_name = AcceptInputCommand.new().get_command_name()
 
 var _has_change_scene_command: bool = false
 
@@ -96,7 +96,7 @@ func visit_call_expr(expr: ESCGrammarExprs.Call):
 
 	_has_commands_after_change_scene_command = _has_change_scene_command_in_scope()
 
-	if command_name == CHANGE_SCENE_COMMAND_NAME:
+	if command_name == change_scene_command_name:
 		_has_change_scene_command = true
 
 		_change_scene_token = expr.get_paren_token()
@@ -109,9 +109,9 @@ func visit_call_expr(expr: ESCGrammarExprs.Call):
 
 			if is_auto_transition != null and not is_auto_transition:
 				_check_for_missing_accept_input_disable()
-	elif command_name == TRANSITION_COMMAND_NAME:
+	elif command_name == transition_command_name:
 		_check_for_missing_accept_input_disable()
-	elif command_name == ACCEPT_INPUT_COMMAND_NAME:
+	elif command_name == accept_input_command_name:
 		var first_arg = args[0] as String
 
 		if first_arg != null and first_arg.to_lower() in ACCEPT_INPUT_DISABLE_ARGS:
diff --git a/addons/escoria-core/tools/script_analysis/analyzers/esc_script_analyzer.gd b/addons/escoria-core/tools/script_analysis/analyzers/esc_script_analyzer.gd
index 874ffa1..2771e43 100644
--- a/addons/escoria-core/tools/script_analysis/analyzers/esc_script_analyzer.gd
+++ b/addons/escoria-core/tools/script_analysis/analyzers/esc_script_analyzer.gd
@@ -1,5 +1,5 @@
-extends RefCounted
 class_name ESCScriptAnalyzer
+extends RefCounted
 
 
 const CURRENT_PLAYER_KEYWORD = "CURRENT_PLAYER"
@@ -18,7 +18,7 @@ var _builtin_functions: Array = [
 
 
 # This must be implemented in child class.
-func analyze(statements: Array) -> void:
+func analyze(_statements: Array) -> void:
 	pass
 
 
@@ -75,8 +75,7 @@ func visit_call_expr(expr: ESCGrammarExprs.Call):
 	if not callee is ESCBaseCommand:
 		if not callee in _builtin_functions:
 			return 0
-		else:
-			return _handle_builtin_function(callee, args)
+		return _handle_builtin_function(callee, args)
 
 	return ESCExecution.RC_OK
 
@@ -115,7 +114,7 @@ func visit_while_stmt(stmt: ESCGrammarStmts.While):
 	return null
 
 
-func visit_pass_stmt(stmt: ESCGrammarStmts.Pass):
+func visit_pass_stmt(_stmt: ESCGrammarStmts.Pass):
 	pass
 
 
@@ -147,11 +146,11 @@ func visit_global_stmt(stmt: ESCGrammarStmts.Global):
 	return null
 
 
-func visit_dialog_stmt(stmt: ESCGrammarStmts.Dialog):
+func visit_dialog_stmt(_stmt: ESCGrammarStmts.Dialog):
 	return null
 
 
-func visit_dialog_option_stmt(stmt: ESCGrammarStmts.DialogOption):
+func visit_dialog_option_stmt(_stmt: ESCGrammarStmts.DialogOption):
 	pass
 
 
@@ -295,7 +294,7 @@ func _look_up_object(name: ESCToken):
 
 # We have no way of knowing what the value will actually be since this is called during static
 # analysis. As such, we'll just return null.
-func _look_up_object_by_global_id(global_id: String):
+func _look_up_object_by_global_id(_global_id: String):
 	return null
 
 
@@ -305,8 +304,7 @@ func look_up_variable(name: ESCToken, expr: ESCGrammarExpr):
 
 	if distance == -1:
 		return _globals.get_value(name)
-	else:
-		return _environment.get_at(distance, name.get_lexeme())
+	return _environment.get_at(distance, name.get_lexeme())
 
 
 func _evaluate(expr: ESCGrammarExpr):
diff --git a/addons/escoria-core/tools/script_analysis/esc_ashes_analyzer.gd b/addons/escoria-core/tools/script_analysis/esc_ashes_analyzer.gd
index 2447a87..f074e6e 100644
--- a/addons/escoria-core/tools/script_analysis/esc_ashes_analyzer.gd
+++ b/addons/escoria-core/tools/script_analysis/esc_ashes_analyzer.gd
@@ -1,6 +1,6 @@
 @tool
-extends Node
 class_name ESCAshesAnalyzer
+extends Node
 
 
 # TODO: Update this when we move from the .esc extension for Escoria scripts to .ash
diff --git a/addons/escoria-core/tools/script_analysis/esc_static_analyzers.gd b/addons/escoria-core/tools/script_analysis/esc_static_analyzers.gd
index 53aa7a9..b06bd78 100644
--- a/addons/escoria-core/tools/script_analysis/esc_static_analyzers.gd
+++ b/addons/escoria-core/tools/script_analysis/esc_static_analyzers.gd
@@ -1,5 +1,5 @@
-extends RefCounted
 class_name ESCStaticAnalyzers
+extends RefCounted
 
 
 var _analyzers = [