Compare commits
2 commits
d114c5f300
...
0c72afcead
Author | SHA1 | Date | |
---|---|---|---|
0c72afcead | |||
841b76b916 |
1391 changed files with 34 additions and 31 deletions
|
@ -23,7 +23,7 @@ static func _blank_for_func_class(code: String) -> String:
|
|||
var comment_line_regex = RegEx.create_from_string(r"^\s*#")
|
||||
var empty_line_regex = RegEx.create_from_string(r"^\s+$")
|
||||
var lines := code.split('\n')
|
||||
var modified_lines: Array[String] = []
|
||||
var modified_lines: PackedStringArray = []
|
||||
|
||||
for line: String in lines:
|
||||
# Spaces between functions & classes
|
||||
|
|
|
@ -6,20 +6,22 @@ const Dock := preload("res://addons/Todo_Manager/Dock.gd")
|
|||
const Todo := preload("res://addons/Todo_Manager/todo_class.gd")
|
||||
const TodoItem := preload("res://addons/Todo_Manager/todoItem_class.gd")
|
||||
|
||||
var _dockUI : Dock
|
||||
var _dockUI: Dock
|
||||
|
||||
|
||||
class TodoCacheValue:
|
||||
var todos: Array
|
||||
var last_modified_time: int
|
||||
|
||||
|
||||
func _init(todos: Array, last_modified_time: int):
|
||||
self.todos = todos
|
||||
self.last_modified_time = last_modified_time
|
||||
|
||||
var todo_cache : Dictionary # { key: script_path, value: TodoCacheValue }
|
||||
var remove_queue : Array
|
||||
var combined_pattern : String
|
||||
var cased_patterns : Array[String]
|
||||
var todo_cache: Dictionary # { key: script_path, value: TodoCacheValue }
|
||||
var remove_queue: Array
|
||||
var combined_pattern: String
|
||||
var cased_patterns: PackedStringArray
|
||||
|
||||
var refresh_lock := false # makes sure _on_filesystem_changed only triggers once
|
||||
|
||||
|
@ -51,7 +53,7 @@ func queue_remove(file: String):
|
|||
_dockUI.todo_items.remove_at(i)
|
||||
|
||||
|
||||
func find_tokens_from_path(scripts: Array[String]) -> void:
|
||||
func find_tokens_from_path(scripts: PackedStringArray) -> void:
|
||||
for script_path in scripts:
|
||||
var file := FileAccess.open(script_path, FileAccess.READ)
|
||||
var contents := file.get_as_text()
|
||||
|
@ -85,13 +87,13 @@ func find_tokens(text: String, script_path: String) -> void:
|
|||
var regex = RegEx.new()
|
||||
# if regex.compile("#\\s*\\bTODO\\b.*|#\\s*\\bHACK\\b.*") == OK:
|
||||
if regex.compile(combined_pattern) == OK:
|
||||
var result : Array[RegExMatch] = regex.search_all(text)
|
||||
var result: Array[RegExMatch] = regex.search_all(text)
|
||||
if result.is_empty():
|
||||
for i in _dockUI.todo_items.size():
|
||||
if _dockUI.todo_items[i].script_path == script_path:
|
||||
_dockUI.todo_items.remove_at(i)
|
||||
return # No tokens found
|
||||
var match_found : bool
|
||||
var match_found: bool
|
||||
var i := 0
|
||||
for todo_item in _dockUI.todo_items:
|
||||
if todo_item.script_path == script_path:
|
||||
|
@ -111,7 +113,7 @@ func create_todo_item(regex_results: Array[RegExMatch], text: String, script_pat
|
|||
var last_line_number := 0
|
||||
var lines := text.split("\n")
|
||||
for r in regex_results:
|
||||
var new_todo : Todo = create_todo(r.get_string(), script_path)
|
||||
var new_todo: Todo = create_todo(r.get_string(), script_path)
|
||||
new_todo.line_number = get_line_number(r.get_string(), text, last_line_number)
|
||||
# GD Multiline comment
|
||||
var trailing_line := new_todo.line_number
|
||||
|
@ -137,7 +139,7 @@ func update_todo_item(todo_item: TodoItem, regex_results: Array[RegExMatch], tex
|
|||
todo_item.todos.clear()
|
||||
var lines := text.split("\n")
|
||||
for r in regex_results:
|
||||
var new_todo : Todo = create_todo(r.get_string(), script_path)
|
||||
var new_todo: Todo = create_todo(r.get_string(), script_path)
|
||||
new_todo.line_number = get_line_number(r.get_string(), text)
|
||||
# GD Multiline comment
|
||||
var trailing_line := new_todo.line_number
|
||||
|
@ -178,9 +180,9 @@ func _on_filesystem_changed() -> void:
|
|||
rescan_files(false)
|
||||
|
||||
|
||||
func find_scripts() -> Array[String]:
|
||||
var scripts : Array[String]
|
||||
var directory_queue : Array[String]
|
||||
func find_scripts() -> PackedStringArray:
|
||||
var scripts: PackedStringArray
|
||||
var directory_queue: Array[String]
|
||||
var dir := DirAccess.open("res://")
|
||||
if dir.get_open_error() == OK:
|
||||
get_dir_contents(dir, scripts, directory_queue)
|
||||
|
@ -210,11 +212,12 @@ func get_cached_todos(script_path: String) -> Array:
|
|||
return cached_value.todos
|
||||
return []
|
||||
|
||||
func get_dir_contents(dir: DirAccess, scripts: Array[String], directory_queue: Array[String]) -> void:
|
||||
|
||||
func get_dir_contents(dir: DirAccess, scripts: PackedStringArray, directory_queue: PackedStringArray) -> void:
|
||||
dir.include_navigational = false
|
||||
dir.include_hidden = false
|
||||
dir.list_dir_begin()
|
||||
var file_name : String = dir.get_next()
|
||||
var file_name: String = dir.get_next()
|
||||
|
||||
while file_name != "":
|
||||
if dir.current_is_dir():
|
||||
|
@ -225,7 +228,7 @@ func get_dir_contents(dir: DirAccess, scripts: Array[String], directory_queue: A
|
|||
else:
|
||||
if file_name.ends_with(".gd") or file_name.ends_with(".cs") \
|
||||
or file_name.ends_with(".c") or file_name.ends_with(".cpp") or file_name.ends_with(".h") \
|
||||
or ((file_name.ends_with(".tscn") and _dockUI.builtin_enabled)):
|
||||
or((file_name.ends_with(".tscn") and _dockUI.builtin_enabled)):
|
||||
scripts.append(dir.get_current_dir().path_join(file_name))
|
||||
file_name = dir.get_next()
|
||||
|
||||
|
@ -266,7 +269,7 @@ func create_todo(todo_string: String, script_path: String) -> Todo:
|
|||
var regex = RegEx.new()
|
||||
for pattern in cased_patterns:
|
||||
if regex.compile(pattern) == OK:
|
||||
var result : RegExMatch = regex.search(todo_string)
|
||||
var result: RegExMatch = regex.search(todo_string)
|
||||
if result:
|
||||
todo.pattern = pattern
|
||||
todo.title = result.strings[0]
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue