Merge branch 'fix/command-parsing-79' into develop

Author: quentincaffeino

addons/quentincaffeino/console/src/ConsoleLine.gd

@@ -99,44 +99,46 @@ func set_text(text, move_caret_to_end = true):
 func execute(input):
 	Console.write_line('[color=#999999]$[/color] ' + input)
 
-	# @var  PoolStringArray
-	var rawCommands = RegExLib.split(RECOMMANDS_SEPARATOR, input)
-
 	# @var  Dictionary[]
-	var parsedCommands = self._parse_commands(rawCommands)
+	var parsedCommands = _parse_commands(input)
 
 	for parsedCommand in parsedCommands:
-		# @var  Command/Command|null
-		var command = Console.get_command(parsedCommand.name)
-
-		if command:
-			Console.Log.debug('Executing `' + parsedCommand.command + '`.')
-			command.execute(parsedCommand.arguments)
-			Console.emit_signal("command_executed", command)
-		else:
-			Console.write_line('Command `' + parsedCommand.name + '` not found.')
-			Console.emit_signal("command_not_found", parsedCommand.name)
+		if parsedCommand.name.length():
+			# @var  Command/Command|null
+			var command = Console.get_command(parsedCommand.name)
+
+			if command:
+				Console.Log.debug('Executing `' + parsedCommand.command + '`.')
+				command.execute(parsedCommand.arguments)
+				Console.emit_signal("command_executed", command)
+			else:
+				Console.write_line('Command `' + parsedCommand.name + '` not found.')
+				Console.emit_signal("command_not_found", parsedCommand.name)
 
 	Console.History.push(input)
 	self.clear()
 
 
-# @param    PoolStringArray  rawCommands
-# @returns  Array
-func _parse_commands(rawCommands):
+# @static
+# @param    String             input
+# @returns  Array<Dictionary>
+static func _parse_commands(input):
 	var resultCommands = []
 
+	# @var  PoolStringArray
+	var rawCommands = RegExLib.split(RECOMMANDS_SEPARATOR, input)
 	for rawCommand in rawCommands:
 		if rawCommand:
-			resultCommands.append(self._parse_command(rawCommand))
+			resultCommands.append(_parse_command(rawCommand))
 
 	return resultCommands
 
 
+# @static
 # @param    String  rawCommand
 # @returns  Dictionary
-func _parse_command(rawCommand):
-	var name = null
+static func _parse_command(rawCommand):
+	var name = ''
 	var arguments = PoolStringArray([])
 
 	var beginning = 0  # int
@@ -145,7 +147,8 @@ func _parse_command(rawCommand):
 	var subString  # String|null
 	for i in rawCommand.length():
 		# Quote
-		if rawCommand[i] in QUOTES and i > 0 and not rawCommand[i - 1] in SCREENERS:
+		if rawCommand[i] in QUOTES and \
+				(i == 0 or i > 0 and not rawCommand[i - 1] in SCREENERS):
 			if isInsideQuotes and rawCommand[i] == openQuote:
 				openQuote = null
 				isInsideQuotes = false

addons/quentincaffeino/console/tests/unit/test_console_line.gd

@@ -0,0 +1,39 @@
+
+extends "res://addons/gut/test.gd"
+
+const ConsoleLine = preload("res://addons/quentincaffeino/console/src/ConsoleLine.gd")
+
+
+func test_parse_command_simple_command_expect_ok():
+	var command_name = "command"
+	var command_line = "%s" % command_name
+
+	var result = ConsoleLine._parse_command(command_line)
+
+	assert_eq(result.command, command_line)
+	assert_eq(result.name, command_name)
+
+
+func test_parse_command_simple_command_with_simple_argument_expect_ok():
+	var command_name = "command"
+	var command_arg01 = "arg01"
+	var command_line = "%s %s" % [command_name, command_arg01]
+
+	var result = ConsoleLine._parse_command(command_line)
+
+	assert_eq(result.command, command_line)
+	assert_eq(result.name, command_name)
+	assert_true(result.arguments.size() == 1)
+	assert_eq(result.arguments[0], command_arg01)
+
+
+func test_parse_commands_simple_commands_get_separated_expect_ok():
+	var command_name01 = "command01"
+	var command_name02 = "command02"
+	var command_line = "%s;%s" % [command_name01, command_name02]
+
+	var result = ConsoleLine._parse_commands(command_line)
+
+	assert_true(result.size() == 2)
+	assert_eq(result[0].name, command_name01)
+	assert_eq(result[1].name, command_name02)