godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96160 from HolonProduction/dict-fix 

Autocompletion: Enable string literal completion in subscripts
This commit is contained in:
Rémi Verschelde 2024-08-27 16:55:31 +02:00
parent 610a887893 c824403853
commit 3eba191c9e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
19 changed files with 181 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_parser.cpp
View File

@ -3122,6 +3122,12 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_subscript(ExpressionNode *
subscript->base = p_previous_operand;
subscript->index = parse_expression(false);
#ifdef TOOLS_ENABLED
if (subscript->index != nullptr && subscript->index->type == Node::LITERAL) {
override_completion_context(subscript->index, COMPLETION_SUBSCRIPT, subscript);
}
#endif
if (subscript->index == nullptr) {
push_error(R"(Expected expression after "[".)");
}

9
modules/gdscript/tests/scripts/completion/index/array_type.cfg Normal file
View File

@ -0,0 +1,9 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]
exclude=[
{"display": "append"},
{"display": "\"append\""},
]

10
modules/gdscript/tests/scripts/completion/index/array_type.gd Normal file
View File

@ -0,0 +1,10 @@
extends Node
var outer
func _ready() -> void:
var inner
var array: Array
array[i➡]

9
modules/gdscript/tests/scripts/completion/index/array_value.cfg Normal file
View File

@ -0,0 +1,9 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]
exclude=[
{"display": "append"},
{"display": "\"append\""},
]

10
modules/gdscript/tests/scripts/completion/index/array_value.gd Normal file
View File

@ -0,0 +1,10 @@
extends Node
var outer
func _ready() -> void:
var inner
var array = []
array[i➡]

11
modules/gdscript/tests/scripts/completion/index/const_dictionary_keys.cfg Normal file
View File

@ -0,0 +1,11 @@
[output]
include=[
{"display": "\"key1\""},
{"display": "\"key2\""},
]
exclude=[
{"display": "keys"},
{"display": "\"keys\""},
{"display": "key1"},
{"display": "key2"},
]

13
modules/gdscript/tests/scripts/completion/index/const_dictionary_keys.gd Normal file
View File

@ -0,0 +1,13 @@
extends Node
var outer
const dict = {
"key1": "value",
"key2": null,
}
func _ready() -> void:
var inner
dict["➡"]

9
modules/gdscript/tests/scripts/completion/index/dictionary_type.cfg Normal file
View File

@ -0,0 +1,9 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]
exclude=[
{"display": "keys"},
{"display": "\"keys\""},
]

10
modules/gdscript/tests/scripts/completion/index/dictionary_type.gd Normal file
View File

@ -0,0 +1,10 @@
extends Node
var outer
func _ready() -> void:
var inner
var dict: Dictionary
dict[i➡]

9
modules/gdscript/tests/scripts/completion/index/dictionary_value.cfg Normal file
View File

@ -0,0 +1,9 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]
exclude=[
{"display": "keys"},
{"display": "\"keys\""},
]

10
modules/gdscript/tests/scripts/completion/index/dictionary_value.gd Normal file
View File

@ -0,0 +1,10 @@
extends Node
var outer
func _ready() -> void:
var inner
var dict = {}
dict[i➡]

11
modules/gdscript/tests/scripts/completion/index/local_dictionary_keys.cfg Normal file
View File

@ -0,0 +1,11 @@
[output]
include=[
{"display": "\"key1\""},
{"display": "\"key2\""},
]
exclude=[
{"display": "keys"},
{"display": "\"keys\""},
{"display": "key1"},
{"display": "key2"},
]

13
modules/gdscript/tests/scripts/completion/index/local_dictionary_keys.gd Normal file
View File

@ -0,0 +1,13 @@
extends Node
var outer
func _ready() -> void:
var inner
var dict: Dictionary = {
"key1": "value",
"key2": null,
}
dict["➡"]

9
modules/gdscript/tests/scripts/completion/index/property_dictionary_keys.cfg Normal file
View File

@ -0,0 +1,9 @@
[output]
exclude=[
{"display": "keys"},
{"display": "\"keys\""},
{"display": "key1"},
{"display": "key2"},
{"display": "\"key1\""},
{"display": "\"key2\""},
]

13
modules/gdscript/tests/scripts/completion/index/property_dictionary_keys.gd Normal file
View File

@ -0,0 +1,13 @@
extends Node
var outer
var dict = {
"key1": "value",
"key2": null,
}
func _ready() -> void:
var inner
dict["➡"]

5
modules/gdscript/tests/scripts/completion/index/untyped_local.cfg Normal file
View File

@ -0,0 +1,5 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]

10
modules/gdscript/tests/scripts/completion/index/untyped_local.gd Normal file
View File

@ -0,0 +1,10 @@
extends Node
var outer
func _ready() -> void:
var inner
var array
array[i➡]

5
modules/gdscript/tests/scripts/completion/index/untyped_property.cfg Normal file
View File

@ -0,0 +1,5 @@
[output]
include=[
{"display": "outer"},
{"display": "inner"},
]

9
modules/gdscript/tests/scripts/completion/index/untyped_property.gd Normal file
View File

@ -0,0 +1,9 @@
extends Node
var outer
var array
func _ready() -> void:
var inner
array[i➡]