1.2

CHANGES.md

@@ -1,3 +1,6 @@
+# 1.2
+- Empty directories properly hide if they have no subdirectories.
+
 # 1.1
 - Added `addons` folder hider option.
 - Preserve folder open/close state.

README.md

@@ -62,3 +62,7 @@ This will then highlight *Files* and *Symbols* that have that tag.
 - [ ] Find and replace.
 - [ ] Improvve meta data based on format.
 - [ ] Show recycle folder with revert actions.
+- [ ] Add your own `allow/block` list for file extensions.
+- [ ] JSON formatting.
+- [ ] JSON error testing.
+- [ ] Auto open/close quotes in MD and TXT.

addons/text_editor/TE_TextEditor.gd

@@ -86,7 +86,7 @@ var symbols:Dictionary = {}
 var tags:Array = []
 var tags_enabled:Dictionary = {}
 var tag_counts:Dictionary = {}
-var exts_enabled:Array = []
+var exts_enabled:Dictionary = {}
 
 var opened:Array = []
 var closed:Array = []
@@ -154,14 +154,15 @@ func _ready():
 	popup_view_file.add_separator()
 	for i in len(MAIN_EXTENSIONS):
 		var ext = MAIN_EXTENSIONS[i]
+		exts_enabled[ext] = true
 		popup_view_file.add_check_item("*." + ext, i+2)
 		popup_view_file.set_item_checked(i+2, true)
-		exts_enabled.append(ext)
 	
 	popup_view_file.add_separator()
 	for i in len(INTERNAL_EXTENSIONS):
 		var ext = INTERNAL_EXTENSIONS[i]
 		var id = i+len(MAIN_EXTENSIONS)+3
+		exts_enabled[ext] = false
 		popup_view_file.add_check_item("*." + ext, id)
 		popup_view_file.set_item_checked(id, false)
 	
@@ -184,8 +185,6 @@ func _ready():
 	update_checks()
 	set_directory()
 
-
-
 func update_checks():
 	# Directories
 	popup_view_dir.set_item_checked(0, show.dir.hidden)
@@ -200,17 +199,15 @@ func update_checks():
 	# Files
 	popup_view_file.set_item_checked(0, show.file.hidden)
 	#
-	popup_view_file.add_separator()
 	for i in len(MAIN_EXTENSIONS):
 		var ext = MAIN_EXTENSIONS[i]
-		popup_view_file.set_item_checked(i+2, true)
+#		popup_view_file.set_item_checked(i+2, exts_enabled)
 	#
-	popup_view_file.add_separator()
 	for i in len(INTERNAL_EXTENSIONS):
 		var ext = INTERNAL_EXTENSIONS[i]
 		var id = i+len(MAIN_EXTENSIONS)+3
-		popup_view_file.set_item_checked(id, false)
+#		popup_view_file.set_item_checked(id, false)
-
+		# TODOOO
 
 func save_state():
 	var state:Dictionary = {
@@ -248,42 +245,41 @@ func load_state():
 		if file_path == state.selected:
 			selected = tab
 	
-#	if selected:
-#		tab_parent.current_tab = selected.get_index()
-	
 	current_directory = state.get("current_directory", current_directory)
 	
-	for k in state.show.dir:
+	_load_property(state, "show", true)
-		show.dir[k] = state.show.dir[k]
-	
-	for k in state.show.file:
-		show.file[k] = state.show.file[k]
 	
 	update_checks()
 	
-	file_list = state.get("file_list", file_list)
+	_load_property(state, "file_list")
-	tag_counts = state.get("tag_counts", tag_counts)
+	_load_property(state, "tag_counts")
-	tags_enabled = state.get("tags_enabled", tags_enabled)
+	_load_property(state, "tags_enabled")
-	exts_enabled = state.get("exts_enabled", exts_enabled)
+	_load_property(state, "exts_enabled")
 	
 	$c/div1.split_offset = state.get("div1", $c/div1.split_offset)
 	$c/div1/div2.split_offset = state.get("div2", $c/div1/div2.split_offset)
 	
 	emit_signal("state_loaded")
 
+func _load_property(state:Dictionary, property:String, merge:bool=false):
+	if property in state and typeof(state[property]) == typeof(self[property]):
+		if merge:
+			_merge(self[property], state[property])
+		else:
+			self[property] = state[property]
+
+func _merge(target:Dictionary, patch:Dictionary):
+	for k in patch:
+		if patch[k] is Dictionary:
+			if not k in target:
+				target[k] = {}
+			_merge(target[k], patch[k])
+		else:
+			target[k] = patch[k]
+
 func _exit_tree():
 	save_state()
 
-# not needed when an editor plugin
-#func _notification(what):
-#	match what:
-#		MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
-#			for tab in get_all_tabs():
-#				if tab.modified:
-#					popup.show()
-#					return
-#			get_tree().quit()
-
 func is_plugin_active():
 	if not Engine.editor_hint:
 		return true
@@ -349,26 +345,13 @@ func _menu_view_file(index:int):
 		popup_view_file.set_item_checked(index, show.file.hidden)
 	
 	# main extensions
-	elif index-2 < len(MAIN_EXTENSIONS):
+	else:
-		var ext = MAIN_EXTENSIONS[index-2]
+		var text = popup_view_file.get_item_text(index)
-		var toggled = ext in exts_enabled
+		var ext = text.substr(2)
-		if toggled:
+		if ext in exts_enabled:
-			exts_enabled.erase(ext)
+			prints(index, text)
-		elif not ext in exts_enabled:
+			exts_enabled[ext] = not exts_enabled[ext]
-			exts_enabled.append(ext)
+			popup_view_file.set_item_checked(index, exts_enabled[ext])
-		popup_view_file.set_item_checked(index, not toggled)
-		refresh_files()
-	
-	# internal extensions
-	elif index-3-len(MAIN_EXTENSIONS) < len(INTERNAL_EXTENSIONS):
-		var ext = INTERNAL_EXTENSIONS[index-3-len(MAIN_EXTENSIONS)]
-		var toggled = ext in exts_enabled
-		if toggled:
-			exts_enabled.erase(ext)
-		elif not ext in exts_enabled:
-			exts_enabled.append(ext)
-		popup_view_file.set_item_checked(index, not toggled)
-		refresh_files()
 
 func _file_dialog_file(file_path:String):
 	match file_dialog.get_meta("mode"):
@@ -456,30 +439,6 @@ func create_dir(file_path:String):
 func _debug_pressed():
 	set_directory()
 
-#func _unhandled_key_input(e:InputEventKey):
-#	if not e.pressed:
-#		return
-#
-#	if e.control:
-#		# save
-#		if e.scancode == KEY_S:
-#			emit_signal("save_files")
-#
-#		# close/unclose tab
-#		elif e.scancode == KEY_W:
-#			if e.shift:
-#				open_last_file()
-#			else:
-#				close_selected()
-#
-#		elif e.scancode == KEY_R:
-#			sort_files()
-#
-#		else:
-#			return
-#
-#	get_tree().set_input_as_handled()
-
 func save_files():
 	emit_signal("save_files")
 
@@ -568,7 +527,6 @@ func is_opened(file_path:String) -> bool:
 func is_selected(file_path:String) -> bool:
 	return get_selected_file() == file_path
 
-
 func recycle_file(file_path:String):
 	var old_base:String = file_path.substr(len("res://")).get_base_dir()
 	var p = file_path.get_file().split(".", true, 1)
@@ -696,7 +654,13 @@ func _scan_dir(id:String, path:String, dir:Directory, last_dir:Dictionary, old_l
 	var a_dirs_and_files = {}
 	var a_files = []
 	var a_dirs = []
-	var info = { file_path=path, all=a_dirs_and_files, files=a_files, dirs=a_dirs, show=true, open=old_last_dir.get("open", true) }
+	var info = {
+		file_path=path,
+		all=a_dirs_and_files,
+		files=a_files,
+		dirs=a_dirs,
+		show=true,
+		open=old_last_dir.get("open", true) }
 	last_dir[id] = info
 	
 	var fname = dir.get_next()
@@ -713,6 +677,8 @@ func _scan_dir(id:String, path:String, dir:Directory, last_dir:Dictionary, old_l
 		else:
 			if show_file(fname):
 				a_dirs_and_files[fname] = file_path
+			else:
+				print("bad file ", fname)
 		
 		fname = dir.get_next()
 	
@@ -727,10 +693,15 @@ func _scan_dir(id:String, path:String, dir:Directory, last_dir:Dictionary, old_l
 	sort_on_ext(a_dirs)
 	sort_on_ext(a_files)
 	
-	# add to last
+	prints("DIRS", a_dirs)
-	if id and not  (show.dir.empty or a_dirs_and_files):
+	prints("FILES", a_files)
+	prints("ALL", a_dirs_and_files.keys())
+	
+	if id and not (show.dir.empty or a_files):
 		info.show = false
 	
+	return info
+
 func sort_on_ext(items:Array):
 	var sorted = []
 	for a in items:

addons/text_editor/TE_Util.gd

@@ -83,6 +83,9 @@ static func file_size(path:String) -> String:
 		return String.humanize_size(bytes)
 	return "-1"
 
+static func hue_shift(c:Color, h:float) -> Color:
+	return c.from_hsv(wrapf(c.h + h, 0.0, 1.0), c.s, c.v, c.a)
+
 #static func sort(d, reverse:bool=false):
 #	return Dict.new(d).sort(reverse)
 #

addons/text_editor/ext/ext_md.gd

@@ -7,8 +7,6 @@ func toggle_comment(t:TextEdit, head:String="<!-- ", tail:String=" -->"):
 func apply_colors(e:TextEditor, t:TextEdit):
 	.apply_colors(e, t)
 	
-	var code:Color = lerp(e.color_text.darkened(.5), Color.yellowgreen, .5)
-	
 	t.add_keyword_color("true", e.color_var)
 	t.add_keyword_color("false", e.color_var)
 	
@@ -20,15 +18,15 @@ func apply_colors(e:TextEditor, t:TextEdit):
 	t.add_color_region("*", "*", Color.tomato.lightened(.3), false)
 	
 	# quote
-	t.add_color_region("> ", "", Color.white.darkened(.6), true)
+	t.add_color_region("> ", "", e.color_text.darkened(.6), true)
 	
 	# comment
 	t.add_color_region("<!--", "-->", e.color_comment, false)
 	
 	# headings
 	var head = e.color_symbol
-	t.add_color_region("# *", "*", head.darkened(.5), true)
+	t.add_color_region("# *", "*", TE_Util.hue_shift(head, -.33), true)
-	t.add_color_region("# \"", "\"", head.lightened(.5), true)
+	t.add_color_region("# \"", "\"", TE_Util.hue_shift(head, .33), true)
 	t.add_color_region("# ", "", head, true)
 	t.add_color_region("## ", "", head, true)
 	t.add_color_region("### ", "", head, true)
@@ -37,13 +35,14 @@ func apply_colors(e:TextEditor, t:TextEdit):
 	t.add_color_region("###### ", "", head, true)
 	
 	# url links
-	t.add_color_region("[", ")", e.color_var.lightened(.5))
+	t.add_color_region("![", ")", e.color_var.lightened(.5))
 	
 	# lists
 	t.add_color_region("- [x", "]", Color.yellowgreen, false)
 	t.add_color_region("- [", " ]", e.color_text.darkened(.6), false)
 	
 	# code blocks
+	var code:Color = lerp(e.color_text.darkened(.5), Color.yellowgreen, .5)
 	t.add_color_region("```", "```", code, false)
 	t.add_color_region("~~~", "~~~", code, false)
 	
@@ -56,8 +55,6 @@ func apply_colors(e:TextEditor, t:TextEdit):
 	# at/mention
 	t.add_color_region("@", " ", Color.yellowgreen, false)
 	
-#	t.add_color_region(": ", "", e.color_text.lightened(.4), true)
-	
 	# tables
 	t.add_color_region("|", "", Color.tan, true)
 

gdignore folder/.gdignore

@@ -1 +0,0 @@
- 

gdignore folder/Can't see me.txt

@@ -1 +0,0 @@
-