From c6c13fd745fc0a145e1766fb095a9a4b33345d92 Mon Sep 17 00:00:00 2001
From: yangwen0228 <yangwen0228@foxmail.com>
Date: Mon, 2 May 2022 23:12:06 +0800
Subject: [PATCH 1/5] some changes to make it work like Emacs vertical file
 completion.

---
 AdvancedNewFile.py                            |   2 +-
 AdvancedNewFile.sublime-settings              |   3 -
 Default (Linux).sublime-keymap                |  14 +-
 Default (OSX).sublime-keymap                  |  14 +-
 Default (Windows).sublime-keymap              |  14 +-
 README.md                                     |  10 +-
 advanced_new_file/anf_util.py                 |   2 -
 advanced_new_file/commands/__init__.py        |   5 +-
 advanced_new_file/commands/command_base.py    | 126 ++++++++++++++++--
 .../commands/copy_file_command.py             |   2 +-
 advanced_new_file/commands/cut_to_file.py     |   4 +-
 .../commands/delete_file_command.py           |   2 +-
 .../commands/duplicate_file_base.py           |  19 ++-
 .../commands/move_file_command.py             |  10 +-
 .../commands/new_file_command.py              |  84 ++++++++++--
 .../completions/completion_base.py            |  26 +++-
 .../completions/nix_completion.py             |  32 +++--
 advanced_new_file/completions/pinyin_lib.py   |  62 +++++++++
 .../completions/windows_completion.py         |   2 +-
 advanced_new_file/lib/ushlex.py               |  48 +++----
 .../platform/windows_platform.py              |   2 +-
 advanced_new_file/reloader.py                 |   2 +
 22 files changed, 388 insertions(+), 97 deletions(-)
 create mode 100644 advanced_new_file/completions/pinyin_lib.py

diff --git a/AdvancedNewFile.py b/AdvancedNewFile.py
index da8226e..4447a39 100644
--- a/AdvancedNewFile.py
+++ b/AdvancedNewFile.py
@@ -12,7 +12,7 @@
 
 # Make sure all dependencies are reloaded on upgrade
 if reloader in sys.modules:
-    reload(sys.modules[reloader])
+    reload(sys.modules[reloader]) # type: ignore
 
 if VERSION > 3000:
     from .advanced_new_file import reloader
diff --git a/AdvancedNewFile.sublime-settings b/AdvancedNewFile.sublime-settings
index b4fcb94..2a74b62 100644
--- a/AdvancedNewFile.sublime-settings
+++ b/AdvancedNewFile.sublime-settings
@@ -17,9 +17,6 @@
     // A default initial value to fill the create new file input path with.
     "default_initial": "",
 
-    // When renaming a file it will we pre populated with the file existing filename.
-    "autofill_path_the_existing": false,
-
     // A boolean defining if cursor text should be used. Text bound by single or
     // double quotes or within a region will be used. If multiple cursors
     // are used, the earliest selection containing a region or existing
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
index 4a9cf79..2a275e2 100644
--- a/Default (Linux).sublime-keymap	
+++ b/Default (Linux).sublime-keymap	
@@ -8,5 +8,17 @@
 		"context": [{
 			"key": "setting.anf_panel"
 		}]
-	}
+	},
+	{"keys": ["ctrl+n"],"command": "advanced_new_file_next",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+p"],"command": "advanced_new_file_prev",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
+		"context": [{"key": "setting.anf_panel"}]
+	},
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
index 4a9cf79..2a275e2 100644
--- a/Default (OSX).sublime-keymap	
+++ b/Default (OSX).sublime-keymap	
@@ -8,5 +8,17 @@
 		"context": [{
 			"key": "setting.anf_panel"
 		}]
-	}
+	},
+	{"keys": ["ctrl+n"],"command": "advanced_new_file_next",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+p"],"command": "advanced_new_file_prev",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
+		"context": [{"key": "setting.anf_panel"}]
+	},
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
index 10433b4..0fd12d2 100644
--- a/Default (Windows).sublime-keymap	
+++ b/Default (Windows).sublime-keymap	
@@ -8,5 +8,17 @@
 		"context": [{
 			"key": "setting.anf_panel"
 		}]
-	}
+	},
+	{"keys": ["ctrl+n"],"command": "advanced_new_file_next",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+p"],"command": "advanced_new_file_prev",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
+		"context": [{"key": "setting.anf_panel"}]
+	},
+	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
+		"context": [{"key": "setting.anf_panel"}]
+	},
 ]
diff --git a/README.md b/README.md
index 274e3d7..d912a2b 100644
--- a/README.md
+++ b/README.md
@@ -12,25 +12,25 @@ Note with either method, you may need to restart Sublime Text 2 for the plugin t
 Installation through [package control](http://wbond.net/sublime_packages/package_control) is recommended. It will handle updating your packages as they become available. To install, do the following.
 
 * In the Command Palette, enter `Package Control: Install Package`
-* Search for `ANF` to see the list of available commands
+* Search for `AdvancedNewFile`
 
 ### Manual
 Clone or copy this repository into the packages directory. You will need to rename the folder to `AdvancedNewFile` if using this method. By default, the Package directory is located at:
 
 * OS X: ~/Library/Application Support/Sublime Text 2/Packages/
-* Windows: %APPDATA%/Sublime Text 2/Packages/
+* Windows: %APPDATA%/Roaming/Sublime Text 2/Packages/
 * Linux: ~/.config/sublime-text-2/Packages/
 
 or
 
 * OS X: ~/Library/Application Support/Sublime Text 3/Packages/
-* Windows: %APPDATA%/Sublime Text 3/Packages/
+* Windows: %APPDATA%/Roaming/Sublime Text 3/Packages/
 * Linux: ~/.config/sublime-text-3/Packages/
 
 Depending on your install on windows, the ST packages path may be `%APPDATA%/Sublime Text 2/...`
 
 ## Usage
-Simply bring up the AdvancedNewFile input through the appropriate [key binding](https://github.com/skuroda/Sublime-AdvancedNewFile#keymaps). Then, enter the path, along with the file name into the input field. Upon pressing enter, the file will be created. In addition, if the directories specified do not yet exists, they will also be created. For more advanced usage of this plugin, be sure to look at [Advanced Path Usage](https://github.com/skuroda/Sublime-AdvancedNewFile#advanced-path-usage). By default, the path to the file being created will be filled shown in the status bar as you enter the path information.
+Simply bring up the AdvancedNewFile input through the appropriate [key binding](https://github.com/skuroda/Sublime-AdvancedNewFile). Then, enter the path, along with the file name into the input field. Upon pressing enter, the file will be created. In addition, if the directories specified do not yet exists, they will also be created. For more advanced usage of this plugin, be sure to look at [Advanced Path Usage](https://github.com/skuroda/Sublime-AdvancedNewFile#advanced-path-usage). By default, the path to the file being created will be filled shown in the status bar as you enter the path information.
 
 **Default directory:**
 The default directory is specified by the `default_root` setting. By default, it will be the top directory of the folders listed in the window. If this cannot be resolved, the home directory will be used. See [Settings](https://github.com/skuroda/Sublime-AdvancedNewFile#settings) (`default_root`) for more information.
@@ -233,7 +233,7 @@ To begin at the home directory simply start with `~/` like you would in the shel
 #### Aliases:
 You can create an alias to quickly navigate to a directory. Simply type in the alias followed by a colon. Then specify the path as you would normally. Note, in an event a specified alias conflicts with a [predefined alias](https://github.com/skuroda/Sublime-AdvancedNewFile#predefined-aliases), the specified alias will take precedence.
 
-Alias paths may be relative or absolute. If a relative path is specified, the `alias_root` setting will be used as the base. When specifying absolute paths, be sure to use the system specific style (e.g. Windows `C:\\Users\\username\\Desktop`, OS X and Linux `/home/username/desktop/`). In addition, you may specify an alias from the home directory by using `~/`.
+Alias paths may be relative or absolute. If a relative path is specified, the `alias_root` setting will be used as the base. When specifying absolute paths, be sure to use the system specific style (e.g. Windows `C:\\Users\\username\\Desktop`, OS X and Linix `/home/username/desktop/`). In addition, you may specify an alias from the home directory by using `~/`.
 
 If an invalid alias is specified, an error pop up will be displayed when trying to create the file.
 
diff --git a/advanced_new_file/anf_util.py b/advanced_new_file/anf_util.py
index cfb837b..4bc7b99 100644
--- a/advanced_new_file/anf_util.py
+++ b/advanced_new_file/anf_util.py
@@ -4,7 +4,6 @@
 
 ALIAS_SETTING = "alias"
 DEFAULT_INITIAL_SETTING = "default_initial"
-AUTOFILL_RENAME = "autofill_path_the_existing"
 USE_CURSOR_TEXT_SETTING = "use_cursor_text"
 SHOW_FILES_SETTING = "show_files"
 SHOW_PATH_SETTING = "show_path"
@@ -46,7 +45,6 @@
 SETTINGS = [
     ALIAS_SETTING,
     DEFAULT_INITIAL_SETTING,
-    AUTOFILL_RENAME,
     USE_CURSOR_TEXT_SETTING,
     SHOW_FILES_SETTING,
     SHOW_PATH_SETTING,
diff --git a/advanced_new_file/commands/__init__.py b/advanced_new_file/commands/__init__.py
index 9821109..0636003 100644
--- a/advanced_new_file/commands/__init__.py
+++ b/advanced_new_file/commands/__init__.py
@@ -1,5 +1,5 @@
 from .helper_commands import AnfReplaceCommand, AdvancedNewFileCommand, AnfRemoveRegionContentAndRegionCommand
-from .new_file_command import AdvancedNewFileNew, AdvancedNewFileNewAtCommand, AdvancedNewFileNewAtFileCommand, AdvancedNewFileNewEventListener
+from .new_file_command import AdvancedNewFileNew, AdvancedNewFileNextCommand, AdvancedNewFilePrevCommand, AdvancedNewFileUpdirCommand, AdvancedNewFileNewAtCommand, AdvancedNewFileNewAtFileCommand, AdvancedNewFileNewEventListener
 from .delete_file_command import AdvancedNewFileDelete
 from .cut_to_file import AdvancedNewFileCutToFile
 from .move_file_command import AdvancedNewFileMove, AdvancedNewFileMoveAtCommand
@@ -9,6 +9,9 @@
     "AnfReplaceCommand",
     "AdvancedNewFileCommand",
     "AdvancedNewFileNew",
+    "AdvancedNewFileNextCommand",
+    "AdvancedNewFilePrevCommand",
+    "AdvancedNewFileUpdirCommand",
     "AdvancedNewFileNewAtCommand",
     "AdvancedNewFileNewAtFileCommand",
     "AdvancedNewFileNewEventListener",
diff --git a/advanced_new_file/commands/command_base.py b/advanced_new_file/commands/command_base.py
index bc45167..df33c85 100644
--- a/advanced_new_file/commands/command_base.py
+++ b/advanced_new_file/commands/command_base.py
@@ -4,6 +4,7 @@
 import sublime
 import sublime_plugin
 import shlex
+import json
 
 from ..anf_util import *
 from ..platform.windows_platform import WindowsPlatform
@@ -22,9 +23,12 @@
 
 
 class AdvancedNewFileBase(object):
+    static_input_panel_view = None
 
     def __init__(self, window):
-        super(AdvancedNewFileBase, self).__init__(window)
+        super()
+        self.window = window
+        self.prev_text = None
 
         if PLATFORM == "windows":
             self.platform = WindowsPlatform(window.active_view())
@@ -91,9 +95,10 @@ def run_setup(self):
     def __get_aliases(self):
         aliases = self.settings.get(ALIAS_SETTING)
         all_os_aliases = self.settings.get(OS_SPECIFIC_ALIAS_SETTING)
-        for key in all_os_aliases:
-            if PLATFORM in all_os_aliases.get(key):
-                aliases[key] = all_os_aliases.get(key).get(PLATFORM)
+        if all_os_aliases is not None and aliases is not None:
+            for key in all_os_aliases:
+                if PLATFORM in all_os_aliases.get(key):
+                    aliases[key] = all_os_aliases.get(key).get(PLATFORM)
 
         return aliases
 
@@ -281,6 +286,8 @@ def show_filename_input(self, initial):
         self.input_panel_view.settings().set("anf_panel", True)
         if self.settings.get(CURSOR_BEFORE_EXTENSION_SETTING):
             self.__place_cursor_before_extension(self.input_panel_view)
+        AdvancedNewFileBase.static_input_panel_view = self.input_panel_view
+        self.__update_filename_input('')
 
     def __update_filename_input(self, path_in):
         new_content = path_in
@@ -288,21 +295,44 @@ def __update_filename_input(self, path_in):
             if "prev_text" in dir(self) and self.prev_text != path_in:
                 if self.view is not None:
                     self.view.erase_status("AdvancedNewFile2")
+
         if path_in.endswith("\t"):
-            new_content = self.completion.completion(path_in.replace("\t", ""))
-        if new_content != path_in:
-            self.input_panel_view.run_command("anf_replace",
-                                              {"content": new_content})
+            creation_path, candidate, completion_list = self.parse_status_line(self.get_status_line()) # type: ignore
+            print("candidate", candidate, str(completion_list))
+            new_content = self.completion_input(path_in.replace("\t", ""), candidate)
+            print("new_content", new_content)
+            # new_content = candidate
         else:
-            base, path = self.split_path(path_in)
+            completion_list = self.completion.hint(path_in)
+            if completion_list:
+                candidate = completion_list[0]
+                completion_list.remove(candidate)
+            else:
+                candidate = ''
 
-            creation_path = generate_creation_path(self.settings, base, path,
-                                                   True)
+        input_view = AdvancedNewFileBase.static_input_panel_view
+        if input_view:
+            input_view.hide_popup()
+        if input_view and new_content != path_in:
+            input_view.run_command("anf_replace", {"content": new_content})
+        else:
+            base, path = self.split_path(path_in)
+            status_line = generate_creation_path(self.settings, base, path, True) + '|' + candidate + str(completion_list)
             if self.settings.get(SHOW_PATH_SETTING, False):
-                self.update_status_message(creation_path)
+                self.update_status_message(status_line)
+            if input_view and candidate and not new_content.endswith(candidate):
+                input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
 
-    def update_status_message(self, creation_path):
-        pass
+    def completion_input(self, path_in, candidate):
+        pattern = r"(.*[/\\:])(.*)"
+
+        match = re.match(pattern, path_in)
+        if match:
+            new_content = re.sub(pattern, r"\1", path_in)
+            new_content += candidate
+        else:
+            new_content = candidate
+        return new_content
 
     def entered_file_action(self, path):
         pass
@@ -364,6 +394,7 @@ def clear(self):
         if self.view is not None:
             self.view.erase_status("AdvancedNewFile")
             self.view.erase_status("AdvancedNewFile2")
+        AdvancedNewFileBase.static_input_panel_view = None
 
     def create(self, filename):
         base, filename = os.path.split(filename)
@@ -466,3 +497,70 @@ def __place_cursor_before_extension(self, view):
                 initial_position = len(matcher.group(1))
                 cursors.clear()
                 cursors.add(sublime.Region(initial_position, initial_position))
+
+    def get_status_line(self):
+        return self.view.get_status("AdvancedNewFile")
+
+    def update_status_message(self, creation_path):
+        if self.view is not None:
+            self.view.set_status("AdvancedNewFile", creation_path)
+        else:
+            sublime.status_message(creation_path)
+
+    def get_status_prefix(self):
+        pass
+
+    def create_status_line(self, creation_path, candidate, completion_list):
+        return creation_path + '|' + candidate + str(completion_list)
+
+    def parse_status_line(self, status_line):
+        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['command_base.py']
+        if status_line:
+            status_line = status_line.strip()
+            index1 = status_line.rindex('[')
+            completion_list = status_line[index1:]
+            try:
+                completion_list = json.loads(completion_list.replace("'", '"'))
+            except Exception as e:
+                print("completion_list", completion_list, e)
+                raise e
+            index2 = status_line.rindex('|')
+            candidate = status_line[index2 + 1:index1]
+            # TODO: prefix_len = len(self.get_status_prefix())
+            creation_path = status_line[0:index2]
+            return (creation_path, candidate, completion_list)
+        else:
+            return ('', '', [])
+
+    def next_candidate(self, candidate, completion_list):
+        if candidate and completion_list:
+            # replace the candidate with the first, and append the old candidate to the last
+            completion_list.append(candidate)
+            candidate = completion_list[0]
+            completion_list.remove(candidate)
+
+        return (candidate, completion_list)
+
+    def prev_candidate(self, candidate, completion_list):
+        if candidate and completion_list:
+            # replace the candidate with the last, and insert the old candidate to the first
+            completion_list.insert(0, candidate)
+            candidate = completion_list.pop()
+
+        return (candidate, completion_list)
+
+    def create_next_status_line(self, creation_path, candidate, completion_list):
+        if candidate and completion_list:
+            candidate, completion_list = self.next_candidate(candidate, completion_list)
+            return self.create_status_line(creation_path, candidate, completion_list)
+        else:
+            # case1: origin completion_list is empty. case2: origin completion_list contains only 1 item
+            sublime.status_message("Completion list is empty.")
+
+    def create_prev_status_line(self, creation_path, candidate, completion_list):
+        if candidate and completion_list:
+            candidate, completion_list = self.prev_candidate(candidate, completion_list)
+            return self.create_status_line(creation_path, candidate, completion_list)
+        else:
+            # case1: origin completion_list is empty. case2: origin completion_list contains only 1 item
+            sublime.status_message("Completion list is empty.")
\ No newline at end of file
diff --git a/advanced_new_file/commands/copy_file_command.py b/advanced_new_file/commands/copy_file_command.py
index 85f93b8..f6892a4 100644
--- a/advanced_new_file/commands/copy_file_command.py
+++ b/advanced_new_file/commands/copy_file_command.py
@@ -8,7 +8,7 @@
 
 class AdvancedNewFileCopy(DuplicateFileBase):
     def __init__(self, window):
-        super(AdvancedNewFileCopy, self).__init__(window)
+        super().__init__(window)
 
     def get_default_setting(self):
         return COPY_DEFAULT_SETTING
diff --git a/advanced_new_file/commands/cut_to_file.py b/advanced_new_file/commands/cut_to_file.py
index 7d34795..bef5170 100644
--- a/advanced_new_file/commands/cut_to_file.py
+++ b/advanced_new_file/commands/cut_to_file.py
@@ -8,7 +8,7 @@
 
 class AdvancedNewFileCutToFile(AdvancedNewFileBase, sublime_plugin.WindowCommand):
     def __init__(self, window):
-        super(AdvancedNewFileCutToFile, self).__init__(window)
+        super().__init__(window)
 
     def run(self, is_python=False):
         self.is_python = is_python
@@ -72,6 +72,8 @@ def _open_and_add_content_to_file(self, path):
 
     def is_enabled(self):
         view = self.window.active_view()
+        if view is None:
+            return False
         cursors = view.sel()
         for cursor in cursors:
             if not cursor.empty():
diff --git a/advanced_new_file/commands/delete_file_command.py b/advanced_new_file/commands/delete_file_command.py
index c509dab..cba41ad 100644
--- a/advanced_new_file/commands/delete_file_command.py
+++ b/advanced_new_file/commands/delete_file_command.py
@@ -10,7 +10,7 @@
 class AdvancedNewFileDelete(AdvancedNewFileBase, sublime_plugin.WindowCommand,
                             GitCommandBase):
     def __init__(self, window):
-        super(AdvancedNewFileDelete, self).__init__(window)
+        super().__init__(window)
 
     def run(self, current=False):
         self.run_setup()
diff --git a/advanced_new_file/commands/duplicate_file_base.py b/advanced_new_file/commands/duplicate_file_base.py
index baf3193..b6bedad 100644
--- a/advanced_new_file/commands/duplicate_file_base.py
+++ b/advanced_new_file/commands/duplicate_file_base.py
@@ -8,7 +8,7 @@
 class DuplicateFileBase(AdvancedNewFileBase, sublime_plugin.WindowCommand):
 
     def __init__(self, window):
-        super(DuplicateFileBase, self).__init__(window)
+        super().__init__(window)
 
     def run(self, is_python=False, initial_path=None, rename_file=None):
         self.is_python = is_python
@@ -27,7 +27,7 @@ def get_argument_name(self):
 
     def duplicate_setup(self):
         view = self.window.active_view()
-        self.original_name = None
+        self.original_name = ""
         if view is not None:
             view_file_name = view.file_name()
             if view_file_name:
@@ -40,10 +40,10 @@ def update_status_message(self, creation_path):
         status_prefix = self.get_status_prefix()
         if self.is_copy_original_name(creation_path):
             creation_path = os.path.join(creation_path, self.original_name)
-        else:
-            creation_path = self.try_append_extension(creation_path)
+        # else:
+        #     creation_path = self.try_append_extension(creation_path)
         if self.view is not None:
-            self.view.set_status("AdvancedNewFile", "%s %s " %
+            self.view.set_status("AdvancedNewFile", "%s %s" %
                                  (status_prefix, creation_path))
         else:
             sublime.status_message("%s %s" %
@@ -67,5 +67,14 @@ def try_append_extension(self, path):
                     path += extension
         return path
 
+    def get_default_setting(self):
+        pass
+
+    def get_status_prefix(self):
+        pass
 
+    def get_append_extension_setting(self):
+        pass
 
+    def get_default_root_setting(self):
+        pass
diff --git a/advanced_new_file/commands/move_file_command.py b/advanced_new_file/commands/move_file_command.py
index 11fcdb7..4d77f39 100644
--- a/advanced_new_file/commands/move_file_command.py
+++ b/advanced_new_file/commands/move_file_command.py
@@ -10,7 +10,7 @@
 
 class AdvancedNewFileMove(DuplicateFileBase, GitCommandBase):
     def __init__(self, window):
-        super(AdvancedNewFileMove, self).__init__(window)
+        super().__init__(window)
 
     def get_default_setting(self):
         return RENAME_DEFAULT_SETTING
@@ -123,14 +123,6 @@ def get_status_prefix(self):
     def get_default_root_setting(self):
         return RENAME_FILE_DEFAULT_ROOT_SETTING
 
-    def generate_initial_path(self):
-        if self.settings.get("autofill_path_the_existing"):
-            file_path = self.window.active_view().file_name()[1:]
-            base, _ = self.split_path(file_path)
-            return file_path[len(base):]
-        else:
-            return super(self.__class__, self).generate_initial_path()
-
 
 class AdvancedNewFileMoveAtCommand(sublime_plugin.WindowCommand):
     def run(self, files):
diff --git a/advanced_new_file/commands/new_file_command.py b/advanced_new_file/commands/new_file_command.py
index 7ab9400..22ac734 100644
--- a/advanced_new_file/commands/new_file_command.py
+++ b/advanced_new_file/commands/new_file_command.py
@@ -11,7 +11,7 @@
 
 class AdvancedNewFileNew(AdvancedNewFileBase, sublime_plugin.WindowCommand):
     def __init__(self, window):
-        super(AdvancedNewFileNew, self).__init__(window)
+        super().__init__(window)
 
     def run(self, is_python=False, initial_path=None):
         self.is_python = is_python
@@ -108,27 +108,84 @@ def curly_braces_balanced(self, path, count=0):
         else:
             return self.curly_braces_balanced(path[1:], count)
 
+    def get_default_root_setting(self):
+        return NEW_FILE_DEFAULT_ROOT_SETTING
+
+    def empty_file_action(self):
+        self.window.new_file()
+
     def update_status_message(self, creation_path):
         if self.view is not None:
-            self.view.set_status("AdvancedNewFile", "Creating file at %s " %
-                                 creation_path)
+            self.view.set_status("AdvancedNewFile", "Creating file at %s" % creation_path)
         else:
             sublime.status_message("Creating file at %s" % creation_path)
 
-    def get_default_root_setting(self):
-        return NEW_FILE_DEFAULT_ROOT_SETTING
 
-    def empty_file_action(self):
-        self.window.new_file()
+class AdvancedNewFileNextCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
+    def __init__(self, window):
+        super().__init__(window)
+
+    def run(self):
+        self.run_setup()
+        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['__init__.py', 'command_base.py']
+        status_line = self.get_status_line()
+        creation_path, candidate, completion_list = self.parse_status_line(status_line) # type: ignore
+        candidate, completion_list = self.next_candidate(candidate, completion_list)
+        self.update_status_message(self.create_status_line(creation_path, candidate, completion_list))
+        input_view = AdvancedNewFileBase.static_input_panel_view
+        if input_view:
+            input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
+
+class AdvancedNewFilePrevCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
+    def __init__(self, window):
+        super().__init__(window)
+
+    def run(self):
+        self.run_setup()
+        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['__init__.py', 'command_base.py']
+        status_line = self.get_status_line()
+        creation_path, candidate, completion_list = self.parse_status_line(status_line) # type: ignore
+        candidate, completion_list = self.prev_candidate(candidate, completion_list)
+        self.update_status_message(self.create_status_line(creation_path, candidate, completion_list))
+        input_view = AdvancedNewFileBase.static_input_panel_view
+        if input_view and candidate and completion_list:
+            input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
+
+
+class AdvancedNewFileUpdirCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
+    def __init__(self, window):
+        super().__init__(window)
 
+    def run(self):
+        self.run_setup()
+        view = AdvancedNewFileBase.static_input_panel_view
+        if view:
+            path_in = view.substr(sublime.Region(0, view.size()))
+            new_content = self.updir(path_in)
+            view.run_command("anf_replace", {"content": new_content})
+
+    def updir(self, path_in):
+        if not(path_in):
+            return ''
+        pattern = r"(.*[/\\:])(.*)"
+        match = re.match(pattern, path_in)
+        if match:
+            if path_in.endswith("/"):
+                new_content = os.path.dirname(path_in[0:-1])
+                if new_content:
+                    new_content +=  "/"
+            else:
+                new_content = re.sub(pattern, r"\1", path_in)
+        else:
+            new_content = ''
+        return new_content
 
 class AdvancedNewFileNewAtCommand(sublime_plugin.WindowCommand):
     def run(self, dirs):
         if len(dirs) != 1:
             return
         path = dirs[0] + os.sep
-        self.window.run_command("advanced_new_file_new",
-                                {"initial_path": path})
+        self.window.run_command("advanced_new_file_new", {"initial_path": path})
 
     def is_visible(self, dirs):
         return len(dirs) == 1
@@ -159,15 +216,18 @@ def on_load(self, view):
                 extension = full_extension[1:]
             settings = get_settings(view)
             if extension in settings.get(FILE_TEMPLATES_SETTING):
-                template = settings.get(FILE_TEMPLATES_SETTING)[extension]
+                template = settings.get(FILE_TEMPLATES_SETTING)[extension] # type: ignore
                 if type(template) == list:
                     if len(template) == 1:
-                        view.run_command("insert_snippet", {"contents": self.get_snippet_from_file(template[0])})
+                        view.run_command("insert_snippet",
+                            {"contents": self.get_snippet_from_file(template[0])})
                     else:
                         entries = list(map(self.get_basename, template))
                         self.entries = list(map(self.expand_path, template))
                         self.view = view
-                        sublime.set_timeout(lambda: view.window().show_quick_panel(entries, self.quick_panel_selection), 10)
+                        sublime.set_timeout(
+                            lambda: view.window().show_quick_panel(entries, self.quick_panel_selection),
+                            10)
                 else:
                     view.run_command("insert_snippet", {"contents": template})
             view.settings().set("_anf_new", "")
diff --git a/advanced_new_file/completions/completion_base.py b/advanced_new_file/completions/completion_base.py
index ae4bd23..ff3ac23 100644
--- a/advanced_new_file/completions/completion_base.py
+++ b/advanced_new_file/completions/completion_base.py
@@ -1,12 +1,14 @@
 import re
 import os
+
 from ..anf_util import *
+from .pinyin_lib import *
 
 
 class GenerateCompletionListBase(object):
     """docstring for GenerateCompletionListBase"""
     def __init__(self, command):
-        super(GenerateCompletionListBase, self).__init__()
+        super().__init__()
         self.top_level_split_char = ":"
         self.command = command
         self.aliases = command.aliases
@@ -30,6 +32,7 @@ def generate_completion_list(self, path_in):
                 alias_list += self.generate_alias_auto_complete(filename)
                 alias_list += self.generate_project_auto_complete(filename)
         base, path = self.command.split_path(path_in)
+        print("base,path", path_in, base, path)
         full_path = generate_creation_path(self.settings, base, path)
 
         directory, filename = os.path.split(full_path)
@@ -79,8 +82,21 @@ def generate_auto_complete(self, base, iterable_var):
         return sugg
 
     def compare_entries(self, compare_entry, compare_base):
-        if self.settings.get(IGNORE_CASE_SETTING):
-            compare_entry = compare_entry.lower()
-            compare_base = compare_base.lower()
+        # if self.settings.get(IGNORE_CASE_SETTING):
+        #     compare_entry = compare_entry.lower()
+        #     compare_base = compare_base.lower()
+
+        # return compare_entry.startswith(compare_base)
+        # turn to fuzzy match
+        pattern = get_str_pattern(compare_base, self.settings.get(IGNORE_CASE_SETTING, True))
+        return re.match(pattern, compare_entry) is not None
 
-        return compare_entry.startswith(compare_base)
+    def hint(self, path_in):
+        (completion_list, alias_list,
+            dir_list, file_list) = self.generate_completion_list(path_in)
+        if len(completion_list) > 0:
+            dir_list = map(lambda s: s + "/", dir_list)
+            alias_list = map(lambda s: s + ":", alias_list)
+            completion_list = sorted(list(dir_list) +
+                                         list(alias_list) + file_list)
+        return completion_list
diff --git a/advanced_new_file/completions/nix_completion.py b/advanced_new_file/completions/nix_completion.py
index acca0b6..236c5b1 100644
--- a/advanced_new_file/completions/nix_completion.py
+++ b/advanced_new_file/completions/nix_completion.py
@@ -8,22 +8,38 @@
 
 class NixCompletion(GenerateCompletionListBase):
     def __init__(self, command):
-        super(NixCompletion, self).__init__(command)
+        super().__init__(command)
 
     def completion(self, path_in):
         pattern = r"(.*[/\\:])(.*)"
 
         (completion_list, alias_list,
             dir_list, file_list) = self.generate_completion_list(path_in)
+        print("completion_list", completion_list)
+        print(alias_list, dir_list, file_list)
+        print(path_in)
         new_content = path_in
         if len(completion_list) > 0:
-            common = os.path.commonprefix(completion_list)
-            match = re.match(pattern, path_in)
-            if match:
-                new_content = re.sub(pattern, r"\1", path_in)
-                new_content += common
+            # common = os.path.commonprefix(completion_list)
+            # match = re.match(pattern, path_in)
+            # if match:
+            #     new_content = re.sub(pattern, r"\1", path_in)
+            #     print("new_content", new_content)
+            #     new_content += common
+            # else:
+            #     new_content = common
+            if len(completion_list) == 1:
+                common = completion_list[0]
+                match = re.match(pattern, path_in)
+                if match:
+                    new_content = re.sub(pattern, r"\1", path_in)
+                    print("new_content", new_content)
+                    new_content += common
+                else:
+                    new_content = common
             else:
-                new_content = common
+                new_content = path_in
+
             if len(completion_list) > 1:
                 dir_list = map(lambda s: s + "/", dir_list)
                 alias_list = map(lambda s: s + ":", alias_list)
@@ -36,4 +52,4 @@ def completion(self, path_in):
                 elif completion_list[0] in dir_list:
                     new_content += "/"
 
-        return new_content
+        return (new_content, completion_list)
diff --git a/advanced_new_file/completions/pinyin_lib.py b/advanced_new_file/completions/pinyin_lib.py
new file mode 100644
index 0000000..1befe2d
--- /dev/null
+++ b/advanced_new_file/completions/pinyin_lib.py
@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+PINYINLIB_SIMPLIFIED_CHAR_LIST = (
+    "阿啊呵腌嗄锕吖爱哀挨碍埃癌艾唉矮哎皑蔼隘暧霭捱嗳瑷嫒锿嗌砹安案按暗岸俺谙黯鞍氨庵桉鹌胺铵揞犴埯昂肮盎奥澳傲熬敖凹袄懊坳嗷拗鏖骜鳌翱岙廒遨獒聱媪螯鏊",
+    "把八吧巴爸罢拔叭芭霸靶扒疤跋坝笆耙粑灞茇菝魃岜捌钯鲅百白败摆伯拜柏呗掰捭佰稗办半版般班板伴搬扮斑颁瓣拌扳绊阪坂瘢钣舨癍帮邦棒膀榜傍绑磅谤浜梆镑蚌蒡报保包暴宝抱薄胞爆鲍饱堡曝刨褒豹雹苞葆褓孢煲鸨龅趵被北备背悲辈杯倍贝碑卑蓓惫悖狈呗焙鹎孛邶陂埤碚褙鐾鞴萆钡本奔笨苯夯畚贲锛坌崩甭绷蹦迸甏泵嘣蚌比必笔毕币避闭鼻彼逼壁臂弊碧鄙毙蔽庇匕璧敝陛弼篦婢愎痹妣濞铋裨俾髀萆薜哔狴庳秕滗舭毖吡嬖蓖贲畀荸埤筚箅芘襞跸荜编便边变遍辩辨贬鞭辫扁卞砭苄匾汴蝙笾碥窆褊弁鳊忭煸缏表标彪镖膘骠镳裱杓飙瘭髟飚婊飑鳔别憋瘪蹩鳖宾滨彬斌鬓缤殡濒槟摈膑傧玢豳髌镔并病兵冰饼丙柄秉炳禀邴摒波播博伯勃薄拨泊柏剥玻驳卜脖搏膊饽簸掰舶跛礴菠帛铂钵渤檗钹擘箔趵孛鹁踣亳啵不部布步补捕怖卜簿哺埔卟埠钸逋醭晡瓿钚",
+    "擦嚓礤才采菜财材彩裁猜蔡踩睬参餐残惨灿惭掺蚕璨孱骖黪粲藏苍仓沧舱伧草操曹糙嘈槽螬艚漕策测侧厕册恻参岑涔曾层蹭噌查察差茶插刹叉诧茬碴喳岔嚓衩杈楂槎檫镲搽锸猹馇汊姹差柴拆豺钗侪虿瘥产颤缠禅蝉馋铲搀阐掺潺忏蟾婵谄谗廛孱澶冁躔蒇骣觇镡羼长场常唱厂尝昌肠偿畅倡倘敞怅娼猖嫦伥氅徜昶鲳阊菖苌鬯惝超朝潮炒吵抄嘲钞绰巢晁焯怊耖车彻撤扯澈掣坼砗称陈沉晨尘臣趁衬辰郴谶琛忱嗔伧抻谌宸榇龀碜成城程称承诚盛乘呈撑惩澄秤瞠橙噌逞铛丞骋埕枨塍铖裎酲柽蛏吃持迟尺赤斥池痴齿驰耻翅匙侈哧嗤啻弛蚩炽笞敕叱饬踟鸱褫豉坻墀茌篪傺媸螭彳眵魑瘛重冲充崇虫宠憧忡艟茺舂铳抽愁仇丑筹臭酬绸踌瞅惆畴稠雠俦帱瘳出处除初楚触储础厨畜躇橱雏矗怵锄杵搐绌黜褚蜍蹰刍滁楮憷亍樗揣啜踹嘬膪搋传穿川船串喘舛遄舡巛氚椽钏创窗床闯幢疮怆吹垂炊锤捶陲槌棰春纯唇蠢醇淳椿鹑蝽莼绰戳啜辍踔龊此次词差刺辞慈磁赐瓷兹茨雌祠疵呲鹚糍茈从匆聪丛葱囱琮淙枞苁骢璁凑楱辏腠促粗簇醋卒猝蹴蹙徂殂蔟酢攒窜篡蹿撺镩汆爨脆粹催摧崔萃翠瘁悴璀隹淬毳榱啐存村寸忖皴错措搓挫撮磋蹉矬嵯脞痤瘥鹾厝锉",
+    "大打达答搭瘩嗒沓耷褡鞑笪靼怛妲哒疸代带待戴袋呆贷逮歹殆黛怠玳岱迨傣呔骀绐埭甙但单担弹淡旦蛋胆诞丹耽惮眈啖澹掸殚箪瘅赕疸聃氮萏郸儋当党荡档挡裆铛宕凼菪谠砀到道导倒岛刀悼盗蹈捣祷叨稻忉帱氘纛的得德锝等登灯邓凳瞪蹬噔磴戥镫簦嶝地第提底低帝弟敌抵递滴迪蒂堤笛缔涤嘀诋谛狄邸睇嫡翟砥娣棣荻羝坻柢觌骶氐绨镝碲籴嗲点电店典颠甸淀垫殿滇奠惦掂碘癫巅踮佃玷簟阽坫靛钿癜丶调掉吊雕刁钓凋叼貂碉铫铞鲷爹跌叠迭碟谍蝶喋佚踮牒耋蹀堞瓞揲垤鲽定订顶丁盯钉鼎叮町铤腚酊仃锭疔啶玎碇耵丢铥动东懂冬洞冻董栋咚恫侗氡硐鸫岽垌峒胨胴都斗豆抖逗兜陡窦蔸蚪篼痘都读度独毒督渡肚杜睹堵赌妒嘟渎笃牍镀犊黩髑椟芏蠹断段短端锻缎煅椴簖对队堆兑碓憝怼镦顿盾吨敦蹲钝炖遁盹沌囤墩趸镦礅砘多夺朵躲舵堕踱咄跺哆剁惰垛驮掇铎裰哚缍沲柁",
+    "额俄恶饿哦鹅扼愕遏噩娥峨呃厄鄂讹婀蛾轭颚鳄锷谔屙锇阏垩腭苊鹗萼莪诶恩摁蒽而二儿尔耳迩饵洱鸸珥铒鲕贰佴",
+    "发法罚乏伐阀砝筏垡珐反饭犯翻范凡烦返番贩繁泛帆藩幡梵樊燔蕃畈钒蘩矾蹯方放房访防仿芳妨纺彷坊肪舫钫鲂邡枋非费飞废肥啡沸菲肺匪诽腓扉吠霏绯妃斐翡蜚痱淝悱鲱篚芾狒镄榧分份纷奋愤粉氛芬坟焚粪忿吩汾棼鼢玢酚偾瀵鲼风封丰峰疯锋逢奉缝凤讽冯蜂枫烽俸砜唪酆葑沣佛否缶夫府服复父负副福富付妇附佛幅伏符赴腐浮扶腹抚覆肤赋弗傅辅拂甫俯斧缚咐脯袱俘敷阜芙釜孚腑匐孵辐涪讣氟桴蜉芾苻茯莩菔幞怫拊滏黼艴麸绂绋趺祓砩黻罘蚨跗蝠呋凫郛稃驸赙馥蝮鲋鳆",
+    "咖尬嘎噶轧伽旮钆尕尜改该概盖丐钙赅溉垓陔戤感干敢赶甘肝杆尴赣橄竿秆擀坩苷柑泔矸澉疳酐淦绀旰刚港钢岗纲缸扛杠冈肛罡戆筻高告稿搞糕膏皋羔睾槁藁缟篙镐诰槔杲郜锆个革各歌格哥戈隔葛割阁胳搁疙咯鸽嗝骼颌屹搿膈镉纥袼仡鬲塥圪哿舸铬硌虼给根跟亘艮哏茛更耿耕颈庚羹梗哽赓鲠埂绠工公共供功攻宫贡恭巩躬龚弓拱肱汞蚣珙觥够购构狗沟勾苟钩觏篝垢佝岣诟鞲笱枸遘媾缑彀故古顾股鼓姑骨固孤谷估雇辜咕沽箍菇汩轱锢蛊梏鸪毂鹄臌瞽罟钴觚鹘菰蛄嘏诂崮酤牿牯痼鲴挂瓜刮寡呱褂卦剐鸹栝胍诖怪乖拐掴关观管官馆惯冠贯罐灌棺莞倌纶掼盥涫鳏鹳广光逛犷咣胱桄规归贵鬼桂跪柜轨瑰诡刽龟硅闺皈傀癸圭晷簋妫鲑匦庋宄炔刿桧炅鳜滚棍鲧绲磙辊衮国过果锅郭裹帼蝈聒馘掴埚虢呙崞猓椁蜾",
+    "哈蛤铪还海孩害嘿咳亥骇骸嗨胲醢氦汉喊含寒汗韩憾涵函翰撼罕旱捍酣悍憨晗瀚鼾顸阚焊蚶焓颔菡撖邗邯行航巷杭夯沆颃绗珩好号毫豪浩耗皓嚎昊郝壕蒿貉灏镐嗥嚆薅濠蚝颢和何合河喝赫核吓贺盒呵禾荷鹤壑阂褐诃涸阖嗬貉曷颌劾盍纥蚵翮菏黑嘿嗨很恨狠痕横衡恒哼亨蘅珩桁红轰洪鸿哄宏虹弘烘泓闳薨讧蕻訇黉荭后候後厚侯喉吼猴逅糇骺堠瘊篌鲎乎护呼胡户湖忽互糊虎壶狐沪惚浒唬葫弧蝴囫瑚斛祜猢鹄醐戽扈唿笏琥滹鹕轷烀冱岵怙鹘槲觳瓠鹱煳话华化花划画滑哗桦猾砉铧骅怀坏徊淮槐踝欢换还环缓患幻唤宦焕痪寰鬟涣浣奂桓缳豢锾郇萑圜洹擐獾漶逭鲩黄皇荒晃慌煌惶恍谎璜徨簧凰幌潢蝗蟥遑隍肓磺癀湟篁鳇会回汇挥辉灰惠毁悔恢慧绘徽讳贿徊晦秽诲诙晖彗麾烩荟卉茴喙蛔恚洄珲蕙哕咴浍虺缋桧隳蟪婚混魂昏浑馄荤诨溷阍珲和或活火获货伙祸惑霍豁夥锪耠劐钬攉藿嚯镬蠖",
+    "",
+    "几给己机记及计即基济辑级极寄际技集纪击奇急激继既积籍鸡吉挤迹季寂绩疾饥祭缉忌剂圾姬矶肌嫉讥藉叽脊冀稽妓棘骥畸蓟汲悸岌伎笈跻瘠亟诘暨霁羁稷偈戟嵇楫唧鲫髻荠箕觊蒺畿虮齑殛墼佶掎芨丌麂蕺咭嵴芰笄哜洎乩戢屐剞跽玑鲚赍犄家加价假架甲佳驾夹嫁嘉贾稼茄佼挟颊皎侥枷珈戛迦伽浃痂胛笳荚葭钾镓嘏郏挢岬徼湫敫袈瘕恝铗袷蛱跏见间件建简坚监减渐检健兼剑艰肩键荐尖鉴剪践奸捡箭舰拣贱溅煎俭槛碱歼缄茧笺柬谏蹇僭涧菅謇硷睑锏饯毽鲣鞯蒹搛谫囝湔缣枧戬戋犍裥笕翦趼楗牮鹣腱踺将讲强江奖降蒋疆酱姜浆僵匠犟缰绛桨耩礓洚豇茳糨教交觉校叫较角脚焦骄郊轿搅嚼胶缴绞饺椒矫娇佼狡浇跤姣窖剿侥皎蕉酵礁鲛徼湫敫僬鹪峤蛟铰艽茭挢噍醮界解接结节街姐阶介借戒杰届皆捷截洁揭劫竭藉睫诫嗟拮孑碣秸诘桀芥偈颉讦疖疥婕羯鲒蚧骱喈进今金近尽仅紧禁劲津斤谨锦筋晋巾浸襟瑾矜靳缙烬噤觐馑堇衿荩廑妗卺赆槿经京精境警竟静惊景敬睛镜竞净井径晶荆兢颈憬靖鲸泾阱儆旌痉迳茎胫腈菁粳獍肼弪婧刭靓窘炯迥扃炅就九究酒久旧救纠揪疚舅韭赳鸠灸咎啾臼鹫阄僦厩玖柩桕鬏局据居句举具剧巨聚拒俱距惧菊拘矩桔驹鞠咀沮瞿锯炬飓趄掬踽踞遽橘倨疽龃屦犋裾钜苴雎鞫椐讵苣锔狙榘莒枸榉窭醵琚捐卷倦眷娟隽绢鹃涓镌锩鄄狷桊蠲觉绝决脚嚼掘诀崛爵抉倔獗嗟厥蹶攫谲矍撅噱孓橛噘珏桷劂爝镢蕨觖军均君俊峻钧隽筠菌郡骏竣麇皲捃浚",
+    "卡咖喀咔佧胩开慨凯铠揩楷恺垲蒈锎剀锴忾看刊侃堪砍坎槛勘瞰龛阚莰戡抗康慷扛炕亢糠伉闶钪考靠铐烤拷犒栲尻可克科客刻课颗渴柯呵棵恪咳苛磕壳坷嗑瞌轲稞疴蝌溘髁钶窠颏珂岢骒缂氪锞蚵肯恳啃垦龈裉坑吭铿空恐控孔倥崆箜口扣抠寇叩蔻眍芤筘苦哭库裤酷枯窟骷刳堀喾绔夸跨垮挎胯侉会快块筷脍蒯哙侩狯浍郐款宽髋况狂矿框旷眶筐匡哐邝诓夼诳圹纩贶亏愧溃窥魁馈睽盔逵葵奎匮傀喟聩岿馗夔篑喹悝暌隗蒉蝰愦揆跬困昆捆坤鲲悃髡锟醌阃琨括阔扩廓栝蛞",
+    "拉啦辣腊喇垃蜡剌邋旯瘌砬来赖莱睐癞籁徕涞赉铼崃濑兰蓝栏烂懒览滥拦篮揽澜榄婪缆斓岚阑褴镧罱谰漤浪狼朗郎廊琅螂榔啷莨锒稂阆蒗老劳牢捞姥佬潦唠烙酪涝崂痨醪铹栳铑耢了乐勒肋叻泐鳓仂类泪累雷蕾垒磊擂肋儡羸诔镭嘞檑嫘缧酹耒冷愣楞棱塄里理力利立李历离例礼丽励黎厉璃莉哩笠粒俐漓栗狸梨隶吏沥篱厘犁雳罹莅戾鲤俚砺藜俪蜊黧郦痢枥逦娌詈骊荔鳢喱鹂嫠蠡鬲鲡悝坜苈砾藓呖唳猁溧澧栎轹蓠傈缡疠疬蛎锂篥粝跞醴俩联连脸练恋怜莲廉炼帘链敛涟镰殓琏楝裢裣蠊鲢濂臁潋蔹奁两量良亮辆梁俩凉粮谅粱晾踉莨墚魉椋靓了料聊疗辽僚廖寥镣潦撩撂缭燎寮嘹钌獠鹩蓼尥列烈裂劣猎咧趔冽洌捩埒躐鬣林临邻琳淋霖麟凛吝鳞磷躏赁嶙辚檩遴粼蔺懔瞵啉膦廪领令另灵零龄凌玲铃陵岭拎伶聆囹棱菱翎苓瓴棂绫呤柃鲮酃泠羚蛉六留流陆刘溜柳碌瘤榴浏硫琉遛馏镏骝绺锍旒熘鎏鹨龙隆笼胧拢咙聋垄珑窿陇癃茏栊泷垅砻楼陋漏搂喽篓偻娄髅蝼镂蒌嵝耧瘘路陆录卢露鲁炉鹿碌庐芦噜颅禄辘卤虏麓泸赂漉戮簏轳鹭掳潞鲈撸栌垆胪蓼渌鸬逯璐辂橹镥舻氇律旅绿率虑履屡侣缕驴吕榈滤捋铝褛闾膂氯稆乱卵峦挛孪栾銮娈滦鸾脔略掠锊论轮伦沦仑抡囵纶落罗络洛逻裸骆萝螺锣箩摞烙捋珞骡猡镙椤倮蠃荦瘰泺漯脶硌雒",
+    "呒马吗妈码麻骂嘛抹玛蚂蟆唛杩犸嬷买卖麦埋迈脉霾劢荬满慢漫曼蛮馒瞒蔓颟谩墁幔螨鞔鳗缦熳镘忙茫盲芒氓莽蟒邙漭硭毛冒猫贸矛帽貌茅茂髦卯耄瑁锚懋袤铆峁牦蟊泖昴茆旄蝥瞀么麽没美每妹眉梅媒枚魅煤昧霉玫媚寐糜袂酶莓嵋楣湄猸镅浼鹛镁们门闷扪懑焖钔梦蒙猛盟朦孟萌勐懵檬蠓瞢甍礞蜢虻艋艨锰密米秘迷弥谜觅眯蜜靡咪谧泌糜汨宓麋醚弭敉芈祢脒幂縻嘧蘼猕糸面免棉眠缅绵勉腼冕娩湎沔眄黾渑妙描秒庙苗渺瞄藐缪淼缈喵眇邈鹋杪灭蔑篾咩乜蠛民敏悯闽泯珉皿抿闵苠岷缗玟愍黾鳘名明命鸣铭冥茗溟酩瞑暝螟谬缪默莫模麽末磨摸摩寞漠墨抹魔陌嘿沫膜蓦蘑茉馍摹貉谟嫫秣镆殁瘼耱貊貘某谋眸缪鍪哞侔蛑目母木幕姆慕牧墓募暮牟亩穆睦拇沐牡仫坶苜毪钼",
+    "嗯唔那拿呢哪纳娜呐捺钠镎肭衲乃奶奈耐氖艿鼐佴萘柰难南男楠喃囡囝腩蝻赧囊囔馕攮曩脑闹恼挠瑙淖呶猱铙孬硇蛲垴呢讷内馁嫩恁能嗯唔你呢尼泥逆倪匿拟腻妮霓昵溺旎睨鲵坭猊怩伲祢慝铌年念廿粘碾捻蔫撵拈黏鲶鲇辇埝娘酿鸟尿袅嬲茑脲捏涅聂孽蹑嗫啮镊镍乜陧颞臬蘖您恁宁凝拧泞咛狞柠佞聍苎甯牛纽扭妞钮拗忸狃农弄浓侬哝脓耨怒努奴弩驽胬孥女钕恧衄暖虐疟诺挪懦糯喏搦傩锘",
+    "哦噢喔欧偶殴呕鸥讴瓯藕沤耦怄",
+    "怕爬帕扒趴啪琶葩耙杷钯筢派排牌拍徘湃俳蒎哌判盘盼叛畔潘攀拚蹒磐爿蟠襻袢泮旁庞胖乓膀磅彷螃滂耪逄跑炮抛泡袍刨咆狍疱脬庖匏配陪培佩赔沛裴呸胚醅锫辔帔旆霈盆喷湓朋鹏碰彭捧棚蓬膨烹抨篷砰澎怦堋蟛嘭硼批否皮屁披疲辟啤脾匹僻劈譬坯痞癖琵毗霹噼媲郫裨纰丕鼙圮蚍蜱貔陂陴砒仳埤擗吡庀邳疋芘枇罴淠铍甓睥便片篇偏骗翩扁犏谝蹁骈缏胼票漂飘瓢嫖瞟骠嘌剽螵缥莩殍撇瞥氕丿苤品贫拼频聘拚姘嫔榀颦牝平评瓶凭萍乒屏苹坪枰娉俜鲆破迫颇婆坡泊泼魄粕珀叵攴钷笸钋陂泺鄱皤剖裒掊普铺扑朴谱浦葡蒲仆脯瀑菩溥匍璞噗圃埔氆镨蹼镤濮莆",
+    "起其期气七奇妻企器汽棋齐旗弃启骑欺歧岂戚凄泣契琪乞祈漆迄脐栖沏祺崎祁琦蹊砌憩淇汔亟绮讫嘁岐萋俟杞芪荠耆槭颀芑屺欹桤綮萁蛴蜞綦鳍麒蕲柒亓骐葺畦圻碛恰洽掐伽袷葜髂前钱千签欠牵浅潜迁谦遣歉纤嵌乾谴铅虔钳骞倩堑黔掮悭芊缱愆荨芡阡佥搴褰肷钎仟犍钤岍箝鬈扦慊椠枪墙抢腔呛锵跄羌蔷戕襁樯炝蜣嫱锖戗羟镪桥悄乔巧侨瞧敲翘俏窍峭锹撬跷憔樵鞘橇诮愀谯荞峤缲硗鞒劁切且窃怯茄趄妾砌惬伽锲挈郄箧慊亲钦琴侵秦勤芹擒寝覃沁禽噙揿檎锓芩嗪螓衾廑溱吣情请青清轻晴庆倾卿擎顷氢罄蜻磬謦苘圊檠黥鲭氰箐綮穷琼穹茕邛蛩筇跫銎求球秋邱囚丘酋蚯裘俅虬鳅逑遒赇泅楸犰湫蝤巯鼽糗去取区曲趣屈趋驱渠躯娶觑瞿岖戌蛐衢蛆癯麴阒祛磲鸲诎蠼劬蕖蘧龋苣黢璩氍朐全权圈劝泉券拳犬诠颧蜷绻荃铨痊鬈辁悛畎醛筌却确缺雀瘸榷鹊阕阙炔悫群裙逡麇强",
+    "然染燃冉髯苒蚺让嚷攘壤瓤穰禳扰绕饶娆桡荛热惹喏人任认忍仁韧刃纫饪壬仞稔葚荏妊轫衽仍扔日容荣融蓉溶绒熔榕戎嵘茸冗肜蝾狨肉柔揉蹂鞣糅如入辱儒乳汝褥嚅茹濡蠕孺缛襦颥薷蓐洳溽铷软阮朊瑞锐芮睿蕤枘蕊蚋润闰若弱偌箬",
+    "洒撒萨卅仨飒挲脎赛塞腮噻鳃三散伞叁毵馓糁霰丧桑嗓搡磉颡扫骚嫂梢臊搔缲缫鳋埽瘙色塞涩瑟啬铯穑森僧杀沙啥傻厦刹纱莎煞砂霎嗄挲歃鲨唼痧裟铩晒筛酾山善闪衫删煽扇陕珊杉擅掺膳栅讪跚汕姗赡潸缮嬗掸膻骟芟埏剡钐鄯舢苫髟疝蟮鳝上商伤尚赏殇裳晌觞熵墒绱垧少绍烧稍勺哨邵梢捎韶苕鞘潲劭杓芍蛸筲艄社设舍涉射摄舌蛇奢赦慑佘赊麝畲厍滠歙猞谁什身深神参甚申审沈伸慎渗绅肾呻婶莘蜃葚娠渖矧诜砷糁谂椹胂哂生声省胜升圣盛剩牲绳甥笙渑眚嵊晟是时十事实使世市识始士师诗式失史视示食室势试石释施适氏驶饰尸拾逝湿誓狮嗜蚀嘘屎侍匙峙仕恃柿轼矢噬拭虱弑蓍埘莳炻谥鲥豕贳铈螫舐筮鲺酾手受收首授守售瘦寿兽狩绶艏书数术属输树述熟束署殊舒叔鼠疏淑抒薯梳暑竖蜀恕墅孰漱枢俞赎黍蔬曙倏庶戍塾澍姝纾秫毹殳疋菽丨沭摅腧刷耍唰率衰摔甩帅蟀涮栓拴闩双爽霜孀泷水谁税睡顺舜瞬吮说朔硕烁铄妁蒴槊搠四死思斯司似私丝寺撕肆厮嘶伺饲嗣祀巳驷鸶俟汜泗厶兕蛳咝姒澌缌耜笥锶送松宋诵耸颂讼悚怂忪淞菘崧嵩凇竦搜艘嗽擞馊薮嗾叟嗖溲飕锼瞍螋苏诉速素俗肃宿塑稣溯酥粟簌夙嗉谡僳愫涑蔌觫算酸蒜狻岁随虽碎遂祟隧髓邃穗隋绥睢荽燧谇眭濉孙损笋荪狲飧榫隼所索缩锁琐梭嗦唆挲娑睃唢嗍蓑羧桫",
+    "他她它踏塔塌榻嗒蹋沓遢挞鳎闼铊趿漯溻獭太台态泰抬胎汰苔呔鲐邰薹酞骀炱跆肽钛谈探弹坦叹坛摊贪滩毯谭潭瘫炭覃痰忐坍袒碳澹檀昙镡郯锬钽堂唐汤躺糖趟倘烫淌膛塘棠搪溏螳瑭樘螗铴醣镗耥饧傥帑羰讨套逃涛掏陶桃淘滔萄焘啕韬饕洮绦鼗特忑忒慝铽忒腾疼藤誊滕体提题替踢梯啼涕蹄剔剃惕屉嚏悌醍缇鹈锑荑倜绨逖裼天田填甜添腆舔恬钿阗畋忝殄掭条调跳挑迢眺鲦佻苕窕髫粜笤龆祧蜩铁贴帖餮萜听停庭厅挺亭婷廷艇町霆汀铤蜓莛梃葶烃同通统痛童彤筒铜桶捅桐瞳佟恸酮恫侗砼嗵仝垌茼峒潼头投偷透钭骰土突图途徒屠涂吐兔秃凸荼酴钍菟堍团湍抟疃彖推退腿褪颓蜕忒煺吞屯饨褪臀囤豚暾氽托脱拖妥拓陀驼唾椭砣驮沱跎坨鸵乇鼍橐佗庹铊酡柁柝箨",
+    "",
+    "",
+    "瓦挖袜娃哇凹娲蛙洼佤腽外歪崴万完晚湾玩碗弯挽顽腕婉惋宛丸蜿莞畹剜豌皖纨琬脘烷芄菀绾望王往网忘亡汪旺枉妄惘罔尢辋魍为位未委维味围卫威微伟谓唯危慰尾违魏玮蔚伪畏胃喂炜韦惟巍纬萎娓苇尉帷渭猥偎薇痿猬逶帏韪煨鲔桅潍隈圩囗诿隗崴洧葳嵬闱沩涠艉軎文问闻温稳吻纹蚊雯紊瘟汶刎阌璺翁瓮嗡蓊蕹我握窝卧渥沃涡斡蜗幄喔倭挝莴肟硪龌无五物务武午舞於误恶吴屋伍悟吾污乌雾侮捂巫毋呜诬勿梧坞戊兀唔晤芜鹜钨妩痦鹉忤寤骛邬牾鼯圬浯仵阢芴庑婺怃杌焐蜈迕鋈",
+    "西系息希喜席习细戏吸洗惜稀悉析夕牺袭昔熙兮溪隙嘻锡晰媳樨熄膝郗犀禧曦奚羲蹊唏淅嬉皙汐徙茜玺熹烯翕蟋屣檄浠僖穸蜥隰觋螅铣菥葸蓰舾矽粞硒醯欷鼷歙饩阋禊舄下夏吓峡厦侠狭霞瞎暇虾唬辖遐匣黠瑕呷狎柙硖瘕罅现先显线险限县鲜献闲宪陷贤仙嫌咸羡掀弦纤娴衔馅涎舷腺跣暹岘猃蚬筅跹莶锨鹇痫铣氙祆籼冼藓酰苋燹霰想相向象香乡像响项享降箱详祥巷厢湘橡翔镶飨襄饷骧葙庠鲞芗缃蟓小笑校消效晓销潇肖萧孝宵削嚣啸逍硝霄淆哮枭骁箫筱哓枵绡魈蛸崤些写谢协鞋携斜泄胁歇谐邪械屑卸挟懈泻亵蟹偕邂榭撷楔瀣蝎颉勰薤燮躞缬獬绁廨榍渫心新信欣辛薪馨鑫芯衅昕忻锌歆镡囟行性形兴星型姓幸刑醒腥杏悻惺邢猩荇擤荥饧硎陉雄兄胸凶熊匈汹芎修休秀袖宿臭羞绣朽锈嗅咻貅髹馐庥鸺岫溴许续需须徐序虚绪吁蓄叙畜嘘恤絮浒墟旭婿栩戌诩胥酗煦砉盱糈醑顼勖洫溆圩蓿选宣旋悬券喧轩玄炫渲绚眩萱漩暄璇谖铉儇痃泫煊楦癣碹揎镟学血雪削穴谑靴薛踅噱泶鳕寻询训迅讯巡逊循旬熏勋驯荤殉醺巽徇埙荀峋洵薰汛郇曛窨恂獯浔鲟蕈浚",
+    "亚压雅牙呀押涯讶鸦哑鸭崖丫芽衙轧痖睚娅蚜伢疋岈琊垭揠迓桠氩砑眼言严演研烟验延沿掩颜厌炎燕阎宴盐咽岩雁焰艳焉淹衍阉奄谚俨檐蜒彦腌焱晏唁妍砚嫣胭湮筵堰赝餍鼹芫偃魇闫崦厣剡恹阏兖郾琰罨鄢谳滟阽鼽酽菸样洋阳央杨养扬仰羊痒漾泱氧鸯秧殃恙疡烊佯鞅怏徉炀蛘要摇药耀遥邀腰姚咬尧谣瑶窑夭肴妖吆钥侥杳窈鹞曜舀铫幺爻徭繇鳐珧轺崾也业夜爷叶野页液耶咽曳拽揶噎烨冶椰掖腋谒邺靥晔铘一以意已义议医易衣艺依译移异益亦亿疑遗忆宜椅伊仪谊抑翼矣役艾乙溢毅蛇裔逸姨夷轶怡蚁弈倚翌颐疫绎彝咦佚奕熠贻漪诣迤弋懿呓驿咿揖旖屹痍薏噫镒刈沂臆缢邑胰猗羿钇舣劓仡酏佾埸诒圯荑壹挹嶷饴嗌峄怿悒铱欹殪黟苡肄镱瘗癔翊蜴眙翳因音引印银隐饮阴姻瘾吟寅殷淫茵荫尹蚓垠喑湮胤鄞氤霪圻铟狺吲夤堙龈洇茚窨应英影营迎硬映赢盈颖鹰婴蝇樱莹荧膺萤萦莺罂瀛楹缨颍嬴鹦瑛茔嘤璎荥撄郢瘿蓥滢潆媵哟唷用永拥勇涌踊泳庸佣咏俑雍恿甬臃邕镛痈壅鳙饔喁墉蛹慵有又由友游右油优邮幽尤忧犹悠幼诱佑黝攸呦酉柚鱿莠囿鼬铀卣猷牖铕疣蚰蝣釉蝤繇莜侑莸宥蚴尢于与语育余遇狱雨於欲预予鱼玉愈域誉吁宇寓豫愚舆粥郁喻羽娱裕愉禹浴馀御逾渔渝俞萸瑜隅驭迂揄圄谕榆屿淤毓虞禺谀妪腴峪竽芋妤臾欤龉觎盂昱煜熨燠窬蝓嵛狳伛俣舁圉庾菀蓣饫阈鬻瘐窳雩瘀纡聿钰鹆鹬蜮员元原院远愿园源圆怨缘援冤袁渊苑猿鸳辕垣媛沅橼芫爰螈鼋眢圜鸢箢塬垸掾瑗月乐越约阅跃曰悦岳粤钥刖瀹栎樾龠钺运云允韵晕孕匀蕴酝筠芸耘陨纭殒愠氲狁熨郓恽昀韫郧",
+    "杂扎砸咋咂匝拶在再载灾仔宰哉栽崽甾咱赞暂攒簪糌瓒拶昝趱錾藏脏葬赃臧锗奘驵早造遭糟澡灶躁噪凿枣皂燥蚤藻缲唣则责泽择咋啧仄迮笮箦舴帻赜昃贼怎谮增赠憎缯罾甑锃炸扎咋诈乍眨渣札栅轧闸榨喳揸柞楂哳吒铡砟齄咤痄蚱摘债宅窄斋寨翟砦瘵战展站占沾斩辗粘盏崭瞻绽蘸湛詹毡栈谵搌旃长张章丈掌涨帐障账胀仗杖彰璋蟑樟瘴漳嶂鄣獐仉幛嫜着找照招朝赵召罩兆昭肇沼诏钊啁棹笊这着者折哲浙遮辙辄谪蔗蛰褶鹧锗磔摺蜇赭柘真阵镇震针珍圳振诊枕斟贞侦赈甄臻箴疹砧桢缜畛轸胗稹祯浈溱蓁椹榛朕鸩政正证整争征挣郑症睁徵蒸怔筝拯铮峥狰诤鲭钲帧之只知至制直治指支志职致值织纸止质执智置址枝秩植旨滞徵帜稚挚汁掷殖芝吱肢脂峙侄窒蜘趾炙痔咫芷栉枳踯桎帙栀祉轾贽痣豸卮轵埴陟郅黹忮彘骘酯摭絷跖膣雉鸷胝蛭踬祗觯中种重众终钟忠衷肿仲锺踵盅冢忪舯螽周州洲粥舟皱骤轴宙咒昼肘帚胄纣诌绉妯碡啁荮籀繇酎主住注助著逐诸朱驻珠祝猪筑竹煮嘱柱烛铸株瞩蛛伫拄贮洙诛褚铢箸蛀茱炷躅竺杼翥渚潴麈槠橥苎侏瘃疰邾舳抓爪拽嘬传专转赚撰砖篆啭馔颛装状壮庄撞妆幢桩奘僮戆追坠缀锥赘隹椎惴骓缒准谆窀肫着桌捉卓琢灼酌拙浊濯茁啄斫镯涿焯浞倬禚诼擢子自字资咨紫滋仔姿吱兹孜梓渍籽姊恣滓谘龇秭呲辎锱眦笫髭淄茈觜訾缁耔鲻嵫赀孳粢趑总宗纵踪综棕粽鬃偬腙枞走奏邹揍驺鲰诹陬鄹组足族祖租阻卒诅俎镞菹赚钻攥纂躜缵最罪嘴醉咀觜蕞尊遵樽鳟撙作做坐座左昨琢佐凿撮柞嘬怍胙唑笮阼祚酢"
+    )
+
+PINYINLIB_SIMPLIFIED_CHAR_PATTERN = []
+for i in range(26):
+    ch = chr(ord('a') + i)
+    PINYINLIB_SIMPLIFIED_CHAR_PATTERN.append('|'.join([c for c in PINYINLIB_SIMPLIFIED_CHAR_LIST[i]]))
+    # print('|'.join([c for c in PINYINLIB_SIMPLIFIED_CHAR_LIST[i]]))
+
+def get_char_pattern(ch, ignore_case=True):
+    result = ''
+    if ord(ch) >= ord('a') and ord(ch) <= ord('z'):
+        if ignore_case:
+            result += chr(ord(ch) - ord('a') + ord('A')) + '|'
+        result += ch + '|' + PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('a')]
+    elif ord(ch) >= ord('A') and ord(ch) <= ord('Z'):
+        if ignore_case:
+            result += chr(ord(ch) - ord('A') + ord('a')) + '|'
+        result += ch + '|' + PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('A')]
+    else:
+        result = ch
+    if result.endswith('|'):
+        result = result[0:-1]
+    return result
+
+def get_str_pattern(st, ignore_case=True):
+    result = '.*'
+    for c in st:
+        result += '(' + get_char_pattern(c, ignore_case) + ').*'
+    return result
+
+
+# if __name__ == '__main__':
+#     print(get_str_pattern('va', ignore_case=True))
diff --git a/advanced_new_file/completions/windows_completion.py b/advanced_new_file/completions/windows_completion.py
index 9f9bfbb..353c50d 100644
--- a/advanced_new_file/completions/windows_completion.py
+++ b/advanced_new_file/completions/windows_completion.py
@@ -5,7 +5,7 @@
 
 class WindowsCompletion(GenerateCompletionListBase):
     def __init__(self, command):
-        super(WindowsCompletion, self).__init__(command)
+        super().__init__(command)
         self.view = command.view
 
     def completion(self, path_in):
diff --git a/advanced_new_file/lib/ushlex.py b/advanced_new_file/lib/ushlex.py
index abc51ac..eef4766 100644
--- a/advanced_new_file/lib/ushlex.py
+++ b/advanced_new_file/lib/ushlex.py
@@ -13,15 +13,15 @@
 import sys
 import unicodedata
 from collections import deque
-from StringIO import StringIO
+# from StringIO import StringIO
 
 __all__ = ["shlex", "split"]
 
 class shlex:
     "A lexical analyzer class for simple shell-like syntaxes."
     def __init__(self, instream=None, infile=None, posix=False, utf=True):
-        if isinstance(instream, basestring):
-            instream = StringIO(instream)
+        # if isinstance(instream, basestring):
+        #     instream = StringIO(instream)
         if instream is not None:
             self.instream = instream
             self.infile = infile
@@ -57,13 +57,13 @@ def __init__(self, instream=None, infile=None, posix=False, utf=True):
         self.filestack = deque()
         self.source = None
         if self.debug:
-            print 'shlex: reading from %s, line %d' \
-                  % (self.instream, self.lineno)
+            print('shlex: reading from %s, line %d' \
+                  % (self.instream, self.lineno))
 
     def push_token(self, tok):
         "Push a token onto the stack popped by the get_token method"
         if self.debug >= 1:
-            print "shlex: pushing token " + repr(tok)
+            print("shlex: pushing token " + repr(tok))
         self.pushback.appendleft(tok)
 
     def push_source(self, newstream, newfile=None):
@@ -76,17 +76,17 @@ def push_source(self, newstream, newfile=None):
         self.lineno = 1
         if self.debug:
             if newfile is not None:
-                print 'shlex: pushing to file %s' % (self.infile,)
+                print('shlex: pushing to file %s' % (self.infile,))
             else:
-                print 'shlex: pushing to stream %s' % (self.instream,)
+                print('shlex: pushing to stream %s' % (self.instream,))
 
     def pop_source(self):
         "Pop the input source stack."
         self.instream.close()
         (self.infile, self.instream, self.lineno) = self.filestack.popleft()
         if self.debug:
-            print 'shlex: popping to %s, line %d' \
-                  % (self.instream, self.lineno)
+            print('shlex: popping to %s, line %d' \
+                  % (self.instream, self.lineno))
         self.state = ' '
 
     def get_token(self):
@@ -94,7 +94,7 @@ def get_token(self):
         if self.pushback:
             tok = self.pushback.popleft()
             if self.debug >= 1:
-                print "shlex: popping token " + repr(tok)
+                print("shlex: popping token " + repr(tok))
             return tok
         # No pushback.  Get a token.
         raw = self.read_token()
@@ -116,9 +116,9 @@ def get_token(self):
         # Neither inclusion nor EOF
         if self.debug >= 1:
             if raw != self.eof:
-                print "shlex: token=" + repr(raw)
+                print("shlex: token=" + repr(raw))
             else:
-                print "shlex: token=EOF"
+                print("shlex: token=EOF")
         return raw
 
     def __is_whitespace(self, c, category):
@@ -139,8 +139,8 @@ def read_token(self):
             if nextchar == '\n':
                 self.lineno = self.lineno + 1
             if self.debug >= 3:
-                print "shlex: in state", repr(self.state), \
-                      "I see character:", repr(nextchar)
+                print("shlex: in state", repr(self.state), \
+                      "I see character:", repr(nextchar))
             if self.state is None:
                 self.token = ''        # past end of file
                 break
@@ -150,7 +150,7 @@ def read_token(self):
                     break
                 if self.__is_whitespace(nextchar, nextcategory):
                     if self.debug >= 2:
-                        print "shlex: I see whitespace in whitespace state"
+                        print("shlex: I see whitespace in whitespace state")
                     if self.token or (self.posix and quoted):
                         break   # emit current token
                     else:
@@ -181,9 +181,9 @@ def read_token(self):
                 quoted = True
                 if not nextchar:      # end of file
                     if self.debug >= 2:
-                        print "shlex: I see EOF in quotes state"
+                        print("shlex: I see EOF in quotes state")
                     # XXX what error should be raised here?
-                    raise ValueError, "No closing quotation"
+                    raise ValueError("No closing quotation")
                 if nextchar == self.state:
                     if not self.posix:
                         self.token = self.token + nextchar
@@ -200,9 +200,9 @@ def read_token(self):
             elif self.state in self.escape:
                 if not nextchar:      # end of file
                     if self.debug >= 2:
-                        print "shlex: I see EOF in escape state"
+                        print("shlex: I see EOF in escape state")
                     # XXX what error should be raised here?
-                    raise ValueError, "No escaped character"
+                    raise ValueError("No escaped character")
                 # In posix shells, only the quote itself or the escape
                 # character may be escaped within quotes.
                 if escapedstate in self.quotes and \
@@ -216,7 +216,7 @@ def read_token(self):
                     break
                 if self.__is_whitespace(nextchar, nextcategory):
                     if self.debug >= 2:
-                        print "shlex: I see whitespace in word state"
+                        print("shlex: I see whitespace in word state")
                     self.state = ' '
                     if self.token or (self.posix and quoted):
                         break   # emit current token
@@ -242,7 +242,7 @@ def read_token(self):
                 else:
                     self.pushback.appendleft(nextchar)
                     if self.debug >= 2:
-                        print "shlex: I see punctuation in word state"
+                        print("shlex: I see punctuation in word state")
                     self.state = ' '
                     if self.token:
                         break   # emit current token
@@ -254,9 +254,9 @@ def read_token(self):
             result = None
         if self.debug > 1:
             if result:
-                print "shlex: raw token=" + repr(result)
+                print("shlex: raw token=" + repr(result))
             else:
-                print "shlex: raw token=EOF"
+                print("shlex: raw token=EOF")
         return result
 
     def sourcehook(self, newfile, encoding='utf-8'):
diff --git a/advanced_new_file/platform/windows_platform.py b/advanced_new_file/platform/windows_platform.py
index aea149b..de97a0c 100644
--- a/advanced_new_file/platform/windows_platform.py
+++ b/advanced_new_file/platform/windows_platform.py
@@ -7,7 +7,7 @@
 class WindowsPlatform(object):
     """docstring for WindowsPlatform"""
     def __init__(self, view):
-        super(WindowsPlatform, self).__init__()
+        super().__init__()
         self.view = view
 
     def split(self, path):
diff --git a/advanced_new_file/reloader.py b/advanced_new_file/reloader.py
index 4440406..d760c17 100644
--- a/advanced_new_file/reloader.py
+++ b/advanced_new_file/reloader.py
@@ -30,6 +30,8 @@
     ".lib.ushlex",
 
     ".completions",
+    '.completions.pinyin_lib',
+    '.completions.completion_base',
     '.completions.nix_completion',
     '.completions.windows_completion',
 

From 988b8a58237934078808d1ad7892ab8b309c28fd Mon Sep 17 00:00:00 2001
From: yangwen0228 <yangwen0228@foxmail.com>
Date: Tue, 3 May 2022 15:40:03 +0800
Subject: [PATCH 2/5] Use enter to choose the completion candidate, and add
 fuzzy sort for completion list.

---
 AdvancedNewFile.sublime-settings              |  5 +-
 Default (Linux).sublime-keymap                |  3 +
 Default (OSX).sublime-keymap                  |  3 +
 Default (Windows).sublime-keymap              |  3 +
 advanced_new_file/anf_util.py                 |  4 +-
 advanced_new_file/commands/command_base.py    | 19 ++++--
 .../commands/new_file_command.py              |  7 +++
 .../completions/completion_base.py            | 32 ++++++++--
 advanced_new_file/completions/fuzzy_sort.py   | 60 +++++++++++++++++++
 advanced_new_file/reloader.py                 |  2 +-
 10 files changed, 124 insertions(+), 14 deletions(-)
 create mode 100644 advanced_new_file/completions/fuzzy_sort.py

diff --git a/AdvancedNewFile.sublime-settings b/AdvancedNewFile.sublime-settings
index 2a74b62..74da2e0 100644
--- a/AdvancedNewFile.sublime-settings
+++ b/AdvancedNewFile.sublime-settings
@@ -179,5 +179,8 @@
     "empty_filename_action": false,
 
     // When specifying initial input, this boolean will place the cursor prior to the .<content>
-    "cursor_before_extension": false
+    "cursor_before_extension": false,
+
+    // Ignore regex patters
+    "filter_regex": ["\\.DS_Store", "\\.git"]
 }
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
index 2a275e2..e4749bb 100644
--- a/Default (Linux).sublime-keymap	
+++ b/Default (Linux).sublime-keymap	
@@ -18,6 +18,9 @@
 	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
 		"context": [{"key": "setting.anf_panel"}]
 	},
+	{"keys": ["enter"],"command": "advanced_new_file_confirm",
+		"context": [{"key": "setting.anf_panel"}]
+	},
 	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
 		"context": [{"key": "setting.anf_panel"}]
 	},
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
index 2a275e2..e4749bb 100644
--- a/Default (OSX).sublime-keymap	
+++ b/Default (OSX).sublime-keymap	
@@ -18,6 +18,9 @@
 	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
 		"context": [{"key": "setting.anf_panel"}]
 	},
+	{"keys": ["enter"],"command": "advanced_new_file_confirm",
+		"context": [{"key": "setting.anf_panel"}]
+	},
 	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
 		"context": [{"key": "setting.anf_panel"}]
 	},
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
index 0fd12d2..67c8e04 100644
--- a/Default (Windows).sublime-keymap	
+++ b/Default (Windows).sublime-keymap	
@@ -18,6 +18,9 @@
 	{"keys": ["ctrl+l"],"command": "advanced_new_file_updir",
 		"context": [{"key": "setting.anf_panel"}]
 	},
+	{"keys": ["enter"],"command": "advanced_new_file_confirm",
+		"context": [{"key": "setting.anf_panel"}]
+	},
 	{"keys": ["ctrl+j"],"command": "insert", "args": {"characters": "\t"},
 		"context": [{"key": "setting.anf_panel"}]
 	},
diff --git a/advanced_new_file/anf_util.py b/advanced_new_file/anf_util.py
index 4bc7b99..05d60a4 100644
--- a/advanced_new_file/anf_util.py
+++ b/advanced_new_file/anf_util.py
@@ -40,6 +40,7 @@
 COPY_FILE_DEFAULT_ROOT_SETTING = "copy_file_default_root"
 DEFAULT_NEW_FILE = "empty_filename_action"
 CURSOR_BEFORE_EXTENSION_SETTING = "cursor_before_extension"
+FILTER_REGEX_SETTING = "filter_regex"
 
 
 SETTINGS = [
@@ -80,7 +81,8 @@
     RENAME_FILE_DEFAULT_ROOT_SETTING,
     COPY_FILE_DEFAULT_ROOT_SETTING,
     DEFAULT_NEW_FILE,
-    CURSOR_BEFORE_EXTENSION_SETTING
+    CURSOR_BEFORE_EXTENSION_SETTING,
+    FILTER_REGEX_SETTING
 ]
 
 NIX_ROOT_REGEX = r"^/"
diff --git a/advanced_new_file/commands/command_base.py b/advanced_new_file/commands/command_base.py
index df33c85..17e1aad 100644
--- a/advanced_new_file/commands/command_base.py
+++ b/advanced_new_file/commands/command_base.py
@@ -296,12 +296,21 @@ def __update_filename_input(self, path_in):
                 if self.view is not None:
                     self.view.erase_status("AdvancedNewFile2")
 
+        input_view = AdvancedNewFileBase.static_input_panel_view
         if path_in.endswith("\t"):
             creation_path, candidate, completion_list = self.parse_status_line(self.get_status_line()) # type: ignore
-            print("candidate", candidate, str(completion_list))
-            new_content = self.completion_input(path_in.replace("\t", ""), candidate)
-            print("new_content", new_content)
-            # new_content = candidate
+            new_content = self.completion_input(path_in.replace("\n", "").replace("\t", ""), candidate)
+        elif path_in.endswith("\n"):
+            path_in = path_in.replace("\n", "")
+            if input_view:
+                # print("visible", input_view.is_popup_visible())
+                if input_view.is_popup_visible():
+                    input_view.run_command("insert", {"characters": "\t"})
+                else:
+                    # print("end panel")
+                    self.on_done(path_in)
+                    self.window.run_command("hide_panel", {"cancel": True})
+            return
         else:
             completion_list = self.completion.hint(path_in)
             if completion_list:
@@ -310,7 +319,7 @@ def __update_filename_input(self, path_in):
             else:
                 candidate = ''
 
-        input_view = AdvancedNewFileBase.static_input_panel_view
+
         if input_view:
             input_view.hide_popup()
         if input_view and new_content != path_in:
diff --git a/advanced_new_file/commands/new_file_command.py b/advanced_new_file/commands/new_file_command.py
index 22ac734..c32d53f 100644
--- a/advanced_new_file/commands/new_file_command.py
+++ b/advanced_new_file/commands/new_file_command.py
@@ -180,6 +180,13 @@ def updir(self, path_in):
             new_content = ''
         return new_content
 
+class AdvancedNewFileConfirmCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
+    def __init__(self, window):
+        super().__init__(window)
+
+    def run(self):
+        pass
+
 class AdvancedNewFileNewAtCommand(sublime_plugin.WindowCommand):
     def run(self, dirs):
         if len(dirs) != 1:
diff --git a/advanced_new_file/completions/completion_base.py b/advanced_new_file/completions/completion_base.py
index ff3ac23..8af7711 100644
--- a/advanced_new_file/completions/completion_base.py
+++ b/advanced_new_file/completions/completion_base.py
@@ -4,6 +4,8 @@
 from ..anf_util import *
 from .pinyin_lib import *
 
+from .fuzzy_sort import sort_by_fuzzy
+
 
 class GenerateCompletionListBase(object):
     """docstring for GenerateCompletionListBase"""
@@ -38,6 +40,8 @@ def generate_completion_list(self, path_in):
         directory, filename = os.path.split(full_path)
         if os.path.isdir(directory):
             for d in os.listdir(directory):
+                if not self.filter_file(d):
+                    continue
                 full_path = os.path.join(directory, d)
                 if os.path.isdir(full_path):
                     is_file = False
@@ -54,7 +58,20 @@ def generate_completion_list(self, path_in):
 
         completion_list = alias_list + dir_list + file_list
 
-        return sorted(completion_list), alias_list, dir_list, file_list
+        return sort_by_fuzzy(filename, completion_list), alias_list, dir_list, file_list
+
+    def filter_file(self, fname):
+        """
+        Returns False if a file should be ignored: If the file matched any of the regular expressions
+        on the settings file
+        """
+        fname = os.path.basename(fname)
+        for regex in self.settings.get('filter_regex', list()):
+            regex = regex.replace('\\\\', '\\')  # Fix backslash escaping on json
+            p = re.compile(regex)
+            if p.match(fname) is not None:
+                return False
+        return True
 
     def generate_project_auto_complete(self, base):
         folder_data = get_project_folder_data(
@@ -94,9 +111,12 @@ def compare_entries(self, compare_entry, compare_base):
     def hint(self, path_in):
         (completion_list, alias_list,
             dir_list, file_list) = self.generate_completion_list(path_in)
+        new_completion_list = []
         if len(completion_list) > 0:
-            dir_list = map(lambda s: s + "/", dir_list)
-            alias_list = map(lambda s: s + ":", alias_list)
-            completion_list = sorted(list(dir_list) +
-                                         list(alias_list) + file_list)
-        return completion_list
+            for path in completion_list:
+                if path in dir_list:
+                    path += "/"
+                elif path in alias_list:
+                    path += ":"
+                new_completion_list.append(path)
+        return new_completion_list
diff --git a/advanced_new_file/completions/fuzzy_sort.py b/advanced_new_file/completions/fuzzy_sort.py
new file mode 100644
index 0000000..28cd499
--- /dev/null
+++ b/advanced_new_file/completions/fuzzy_sort.py
@@ -0,0 +1,60 @@
+from operator import itemgetter
+# import numpy as np
+
+def sort_by_fuzzy(query, choices):
+    if not query or not choices:
+        return choices
+    choices_ratio = {}
+    for choice in choices:
+        choices_ratio[choice] = levenshtein_ratio(query, choice)
+
+    # print(choices_ratio)
+    return [key[0] for key in sorted(choices_ratio.items(), key=itemgetter(1), reverse=True)]
+
+def levenshtein_ratio(s, t):
+    """ levenshtein_ratio_and_distance:
+        Calculates levenshtein distance between two strings.
+        If ratio_calc = True, the function computes the
+        levenshtein distance ratio of similarity between two strings
+        For all i and j, distance[i,j] will contain the Levenshtein
+        distance between the first i characters of s and the
+        first j characters of t
+    """
+    # Initialize matrix of zeros
+    rows = len(s)+1
+    cols = len(t)+1
+    distance = [[0 for i in range(cols)] for j in range(rows)]
+    # distance = np.zeros((rows, cols),dtype=int)
+
+    # Populate matrix of zeros with the indeces of each character of both strings
+    for i in range(1, rows):
+        for k in range(1,cols):
+            distance[i][0] = i
+            distance[0][k] = k
+
+    # Iterate over the matrix to compute the cost of deletions,insertions and/or substitutions
+    for col in range(1, cols):
+        for row in range(1, rows):
+            if s[row-1].lower() == t[col-1].lower():
+                cost = 0 # If the characters are the same in the two strings in a given position [i,j] then the cost is 0
+            else:
+                # In order to align the results with those of the Python Levenshtein package, if we choose to calculate the ratio
+                # the cost of a substitution is 2.
+                cost = 1
+            distance[row][col] = min(distance[row-1][col] + 1,      # Cost of deletions
+                                 distance[row][col-1] + 1,          # Cost of insertions
+                                 distance[row-1][col-1] + cost)     # Cost of substitutions
+
+    # Computation of the Levenshtein Distance Ratio
+    ratio = ((len(s)+len(t)) - distance[row][col]) / (len(s)+len(t))
+    if rows < cols:
+        ratio = max(ratio, ((len(s)+len(t)) - distance[row][row]) / (len(s)+len(t)))
+    return ratio
+
+# if __name__ == '__main__':
+#     print(levenshtein_ratio('test', 'test'))
+#     print(levenshtein_ratio('test', 'test tt'))
+#     print(levenshtein_ratio('test', 'taebsct'))
+#     print(levenshtein_ratio('test', 'tabtest'))
+#     print(levenshtein_ratio('test', 'tst tt'))
+#     print(sort_by_fuzzy('def', ['advanced_new_file', 'AdvancedNewFile.py', 'AdvancedNewFile.sublime-settings', 'Default (Linux).sublime-keymap', 'Default (OSX).sublime-keymap', 'Default (Windows).sublime-keymap', 'Default.sublime-commands']))
\ No newline at end of file
diff --git a/advanced_new_file/reloader.py b/advanced_new_file/reloader.py
index d760c17..f47194e 100644
--- a/advanced_new_file/reloader.py
+++ b/advanced_new_file/reloader.py
@@ -23,13 +23,13 @@
 mods_load_order = [
     '',
     '.anf_util',
-    '.completion_base',
 
     ".lib",
     ".lib.package_resources",
     ".lib.ushlex",
 
     ".completions",
+    '.completions.fuzzy_sort',
     '.completions.pinyin_lib',
     '.completions.completion_base',
     '.completions.nix_completion',

From 9066872151fd254d79c8a8ae2eadd30d22dc1d9c Mon Sep 17 00:00:00 2001
From: yangwen0228 <yangwen0228@foxmail.com>
Date: Wed, 4 May 2022 22:55:10 +0800
Subject: [PATCH 3/5] A project files command is added, and improve the
 variable exchange method

---
 advanced_new_file/commands/__init__.py        |   4 +-
 advanced_new_file/commands/command_base.py    | 101 +++++++++++-------
 .../commands/new_file_command.py              |  42 +++++---
 .../commands/project_file_command.py          |  52 +++++++++
 .../completions/completion_base.py            |  40 ++++++-
 advanced_new_file/completions/fuzzy_sort.py   |   8 +-
 advanced_new_file/reloader.py                 |   4 +-
 7 files changed, 191 insertions(+), 60 deletions(-)
 create mode 100644 advanced_new_file/commands/project_file_command.py

diff --git a/advanced_new_file/commands/__init__.py b/advanced_new_file/commands/__init__.py
index 0636003..f1c69ee 100644
--- a/advanced_new_file/commands/__init__.py
+++ b/advanced_new_file/commands/__init__.py
@@ -4,6 +4,7 @@
 from .cut_to_file import AdvancedNewFileCutToFile
 from .move_file_command import AdvancedNewFileMove, AdvancedNewFileMoveAtCommand
 from .copy_file_command import AdvancedNewFileCopy, AdvancedNewFileCopyAtCommand
+from .project_file_command import AdvancedNewFileProjectFileCommand
 
 __all__ = [
     "AnfReplaceCommand",
@@ -21,5 +22,6 @@
     "AdvancedNewFileCopy",
     "AdvancedNewFileCopyAtCommand",
     "AnfRemoveRegionContentAndRegionCommand",
-    "AdvancedNewFileCutToFile"
+    "AdvancedNewFileCutToFile",
+    "AdvancedNewFileProjectFileCommand"
 ]
diff --git a/advanced_new_file/commands/command_base.py b/advanced_new_file/commands/command_base.py
index 17e1aad..492d58b 100644
--- a/advanced_new_file/commands/command_base.py
+++ b/advanced_new_file/commands/command_base.py
@@ -23,8 +23,6 @@
 
 
 class AdvancedNewFileBase(object):
-    static_input_panel_view = None
-
     def __init__(self, window):
         super()
         self.window = window
@@ -270,6 +268,38 @@ def __translate_alias(self, path):
     def input_panel_caption(self):
         return ""
 
+    def get_active_window_settings(self):
+        return sublime.active_window().settings()
+
+    def set_input_view(self, input_view):
+        self.get_active_window_settings().set("anf_input_view", input_view.id())
+
+    def get_input_view(self):
+        return sublime.View(self.get_active_window_settings().get("anf_input_view"))
+
+
+    def get_active_view_settings(self):
+        view = self.get_input_view()
+        if view:
+            return view.settings()
+        else:
+            return self.get_active_window_settings()
+
+    def clear_input_view(self):
+        self.get_active_view_settings().erase("anf_input_view")
+
+    def set_input_view_content(self, content):
+        self.get_active_view_settings().set("anf_input_view_content", content)
+
+    def get_input_view_content(self):
+        return self.get_active_view_settings().get("anf_input_view_content")
+
+    def clear_input_view_content(self):
+        self.get_active_view_settings().erase("anf_input_view_content")
+
+    def clear_input_view_project_files(self):
+        self.get_active_view_settings().erase("anf_input_view_project_files")
+
     def show_filename_input(self, initial):
         caption = self.input_panel_caption()
 
@@ -286,8 +316,8 @@ def show_filename_input(self, initial):
         self.input_panel_view.settings().set("anf_panel", True)
         if self.settings.get(CURSOR_BEFORE_EXTENSION_SETTING):
             self.__place_cursor_before_extension(self.input_panel_view)
-        AdvancedNewFileBase.static_input_panel_view = self.input_panel_view
-        self.__update_filename_input('')
+        self.set_input_view(self.input_panel_view)
+        self.__update_filename_input(initial)
 
     def __update_filename_input(self, path_in):
         new_content = path_in
@@ -296,9 +326,9 @@ def __update_filename_input(self, path_in):
                 if self.view is not None:
                     self.view.erase_status("AdvancedNewFile2")
 
-        input_view = AdvancedNewFileBase.static_input_panel_view
+        input_view = self.get_input_view()
         if path_in.endswith("\t"):
-            creation_path, candidate, completion_list = self.parse_status_line(self.get_status_line()) # type: ignore
+            creation_path, candidate, completion_list = self.get_input_view_content()
             new_content = self.completion_input(path_in.replace("\n", "").replace("\t", ""), candidate)
         elif path_in.endswith("\n"):
             path_in = path_in.replace("\n", "")
@@ -312,25 +342,41 @@ def __update_filename_input(self, path_in):
                     self.window.run_command("hide_panel", {"cancel": True})
             return
         else:
-            completion_list = self.completion.hint(path_in)
+            completion_list = self.get_completion_list(path_in)
             if completion_list:
                 candidate = completion_list[0]
                 completion_list.remove(candidate)
             else:
                 candidate = ''
 
-
         if input_view:
-            input_view.hide_popup()
+            try:
+                input_view.hide_popup()
+            except Exception as e:
+                print("hide_popup", e)
         if input_view and new_content != path_in:
             input_view.run_command("anf_replace", {"content": new_content})
         else:
             base, path = self.split_path(path_in)
-            status_line = generate_creation_path(self.settings, base, path, True) + '|' + candidate + str(completion_list)
+            creation_path = generate_creation_path(self.settings, base, path, True)
+            status_line = self.create_status_line(creation_path, candidate, completion_list)
+            self.set_input_view_content((creation_path, candidate, completion_list))
+
             if self.settings.get(SHOW_PATH_SETTING, False):
                 self.update_status_message(status_line)
-            if input_view and candidate and not new_content.endswith(candidate):
-                input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
+            if not new_content.endswith(candidate):
+                self.show_input_popup(candidate, completion_list)
+
+    def show_input_popup(self, candidate, completion_list):
+        try:
+            input_view = self.get_input_view()
+            if input_view and candidate:
+                input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list), max_width=1024)
+        except Exception as e:
+            print("show_popup", e)
+
+    def get_completion_list(self, path_in):
+        return self.completion.complete_for_folder(path_in)
 
     def completion_input(self, path_in, candidate):
         pattern = r"(.*[/\\:])(.*)"
@@ -403,7 +449,9 @@ def clear(self):
         if self.view is not None:
             self.view.erase_status("AdvancedNewFile")
             self.view.erase_status("AdvancedNewFile2")
-        AdvancedNewFileBase.static_input_panel_view = None
+        self.clear_input_view()
+        self.clear_input_view_content()
+        self.clear_input_view_project_files()
 
     def create(self, filename):
         base, filename = os.path.split(filename)
@@ -455,7 +503,10 @@ def get_cursor_path(self):
                 break
             if (re.match(".*string.quoted.double", syntax) or
                     re.match(".*string.quoted.single", syntax)):
-                path = view.substr(view.extract_scope(region.begin()))
+                point = region.begin()
+                if (re.match(".*punctuation.definition.string.end", syntax)):
+                    point -= 1
+                path = view.substr(view.extract_scope(point))
                 path = re.sub('^"|\'', '',  re.sub('"|\'$', '', path.strip()))
                 break
 
@@ -507,9 +558,6 @@ def __place_cursor_before_extension(self, view):
                 cursors.clear()
                 cursors.add(sublime.Region(initial_position, initial_position))
 
-    def get_status_line(self):
-        return self.view.get_status("AdvancedNewFile")
-
     def update_status_message(self, creation_path):
         if self.view is not None:
             self.view.set_status("AdvancedNewFile", creation_path)
@@ -522,25 +570,6 @@ def get_status_prefix(self):
     def create_status_line(self, creation_path, candidate, completion_list):
         return creation_path + '|' + candidate + str(completion_list)
 
-    def parse_status_line(self, status_line):
-        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['command_base.py']
-        if status_line:
-            status_line = status_line.strip()
-            index1 = status_line.rindex('[')
-            completion_list = status_line[index1:]
-            try:
-                completion_list = json.loads(completion_list.replace("'", '"'))
-            except Exception as e:
-                print("completion_list", completion_list, e)
-                raise e
-            index2 = status_line.rindex('|')
-            candidate = status_line[index2 + 1:index1]
-            # TODO: prefix_len = len(self.get_status_prefix())
-            creation_path = status_line[0:index2]
-            return (creation_path, candidate, completion_list)
-        else:
-            return ('', '', [])
-
     def next_candidate(self, candidate, completion_list):
         if candidate and completion_list:
             # replace the candidate with the first, and append the old candidate to the last
diff --git a/advanced_new_file/commands/new_file_command.py b/advanced_new_file/commands/new_file_command.py
index c32d53f..fc6be50 100644
--- a/advanced_new_file/commands/new_file_command.py
+++ b/advanced_new_file/commands/new_file_command.py
@@ -32,7 +32,7 @@ def entered_file_action(self, path):
 
     def multi_file_action(self, paths):
         for path in paths:
-            self.single_file_action(path, False)
+            self.single_file_action(path)
 
     def single_file_action(self, path, apply_template=True):
         attempt_open = True
@@ -127,14 +127,18 @@ def __init__(self, window):
 
     def run(self):
         self.run_setup()
-        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['__init__.py', 'command_base.py']
-        status_line = self.get_status_line()
-        creation_path, candidate, completion_list = self.parse_status_line(status_line) # type: ignore
+        try:
+            creation_path, candidate, completion_list = self.get_input_view_content()
+        except Exception:
+            # if the content is not init, then simulate the new input
+            input_view = self.get_input_view()
+            input_view.run_command("anf_replace", {"content": ""})
+            creation_path, candidate, completion_list = self.get_input_view_content()
+
         candidate, completion_list = self.next_candidate(candidate, completion_list)
+        self.set_input_view_content((creation_path, candidate, completion_list))
         self.update_status_message(self.create_status_line(creation_path, candidate, completion_list))
-        input_view = AdvancedNewFileBase.static_input_panel_view
-        if input_view:
-            input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
+        self.show_input_popup(candidate, completion_list)
 
 class AdvancedNewFilePrevCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
     def __init__(self, window):
@@ -142,14 +146,18 @@ def __init__(self, window):
 
     def run(self):
         self.run_setup()
-        # Creating file at AdvancedNewFile/advanced_new_file/commands/|__init__.py['__init__.py', 'command_base.py']
-        status_line = self.get_status_line()
-        creation_path, candidate, completion_list = self.parse_status_line(status_line) # type: ignore
+        try:
+            creation_path, candidate, completion_list = self.get_input_view_content()
+        except Exception:
+            # if the content is not init, then simulate the new input
+            input_view = self.get_input_view()
+            input_view.run_command("anf_replace", {"content": ""})
+            creation_path, candidate, completion_list = self.get_input_view_content()
+
         candidate, completion_list = self.prev_candidate(candidate, completion_list)
+        self.set_input_view_content((creation_path, candidate, completion_list))
         self.update_status_message(self.create_status_line(creation_path, candidate, completion_list))
-        input_view = AdvancedNewFileBase.static_input_panel_view
-        if input_view and candidate and completion_list:
-            input_view.show_popup('<strong>' + candidate + '</strong><br/>' + '<br/>'.join(completion_list))
+        self.show_input_popup(candidate, completion_list)
 
 
 class AdvancedNewFileUpdirCommand(AdvancedNewFileBase, sublime_plugin.WindowCommand):
@@ -158,11 +166,11 @@ def __init__(self, window):
 
     def run(self):
         self.run_setup()
-        view = AdvancedNewFileBase.static_input_panel_view
-        if view:
-            path_in = view.substr(sublime.Region(0, view.size()))
+        input_view = self.get_input_view()
+        if input_view:
+            path_in = input_view.substr(sublime.Region(0, input_view.size()))
             new_content = self.updir(path_in)
-            view.run_command("anf_replace", {"content": new_content})
+            input_view.run_command("anf_replace", {"content": new_content})
 
     def updir(self, path_in):
         if not(path_in):
diff --git a/advanced_new_file/commands/project_file_command.py b/advanced_new_file/commands/project_file_command.py
new file mode 100644
index 0000000..bbeb5c8
--- /dev/null
+++ b/advanced_new_file/commands/project_file_command.py
@@ -0,0 +1,52 @@
+import sublime
+import sublime_plugin
+import os
+import re
+import xml.etree.ElementTree as ET
+
+from .new_file_command import AdvancedNewFileNew
+from ..lib.package_resources import get_resource
+from ..anf_util import *
+
+
+class AdvancedNewFileProjectFileCommand(AdvancedNewFileNew, sublime_plugin.WindowCommand):
+    def __init__(self, window):
+        super().__init__(window)
+
+    def run(self, is_python=False, initial_path=None):
+        self.is_python = is_python
+        self.run_setup()
+        self.show_filename_input(self.generate_initial_path(initial_path))
+
+    def get_project_folder(self):
+        return sublime.active_window().folders()[0]
+
+    def split_path(self, path_in):
+        return (self.get_project_folder(), path_in)
+
+    def entered_file_action(self, path):
+        if self.settings.get(SHELL_INPUT_SETTING, False):
+            self.multi_file_action(self.curly_brace_expansion(path))
+        else:
+            self.single_file_action(path)
+
+    def input_panel_caption(self):
+        caption = 'Enter a path for a project file'
+        return caption
+
+    def update_status_message(self, creation_path):
+        if self.view is not None:
+            self.view.set_status("AdvancedNewFile", "Project file at %s" % creation_path)
+        else:
+            sublime.status_message("Project file at %s" % creation_path)
+
+    def get_completion_list(self, path_in):
+        return self.completion.complete_for_project(path_in)
+
+    def set_input_view_project_files(self, project_files):
+        self.get_active_view_settings().set("anf_input_view_project_files", project_files)
+
+    def get_input_view_project_files(self):
+        return self.get_active_view_settings().get("anf_input_view_project_files")
+
+
diff --git a/advanced_new_file/completions/completion_base.py b/advanced_new_file/completions/completion_base.py
index 8af7711..05c38ba 100644
--- a/advanced_new_file/completions/completion_base.py
+++ b/advanced_new_file/completions/completion_base.py
@@ -34,7 +34,7 @@ def generate_completion_list(self, path_in):
                 alias_list += self.generate_alias_auto_complete(filename)
                 alias_list += self.generate_project_auto_complete(filename)
         base, path = self.command.split_path(path_in)
-        print("base,path", path_in, base, path)
+        # print("base,path", path_in, base, path)
         full_path = generate_creation_path(self.settings, base, path)
 
         directory, filename = os.path.split(full_path)
@@ -58,7 +58,7 @@ def generate_completion_list(self, path_in):
 
         completion_list = alias_list + dir_list + file_list
 
-        return sort_by_fuzzy(filename, completion_list), alias_list, dir_list, file_list
+        return sort_by_fuzzy(filename, completion_list, 20), alias_list, dir_list, file_list
 
     def filter_file(self, fname):
         """
@@ -108,7 +108,7 @@ def compare_entries(self, compare_entry, compare_base):
         pattern = get_str_pattern(compare_base, self.settings.get(IGNORE_CASE_SETTING, True))
         return re.match(pattern, compare_entry) is not None
 
-    def hint(self, path_in):
+    def complete_for_folder(self, path_in):
         (completion_list, alias_list,
             dir_list, file_list) = self.generate_completion_list(path_in)
         new_completion_list = []
@@ -120,3 +120,37 @@ def hint(self, path_in):
                     path += ":"
                 new_completion_list.append(path)
         return new_completion_list
+
+
+    def complete_for_project(self, path_in):
+        directory = self.command.get_project_folder()
+
+        completion_list = []
+        if os.path.isdir(directory):
+            files = self.command.get_input_view_project_files()
+            if not files:
+                files = self.get_files_recursively(directory, self.filter_file)
+                self.command.set_input_view_project_files(files)
+            else:
+                print("use the old files", str(len(files)))
+            for file in files:
+                if self.compare_entries(os.path.basename(file), path_in):
+                    completion_list.append(file)
+
+        return sort_by_fuzzy(path_in, completion_list, 20)
+
+    def get_files_recursively(self, dir, filter_func=None):
+        if not os.path.isdir(dir):
+            return list(dir)
+        dirlist = os.walk(dir)
+        result = []
+        for root, _, files in dirlist:
+            rel_path = os.path.relpath(root, dir)
+            for file in files:
+                rel_file = os.path.join(rel_path, file)
+                if filter_func:
+                    if filter_func(rel_file):
+                        result.append(rel_file)
+                else:
+                    result.append(rel_file)
+        return result
\ No newline at end of file
diff --git a/advanced_new_file/completions/fuzzy_sort.py b/advanced_new_file/completions/fuzzy_sort.py
index 28cd499..c6d562d 100644
--- a/advanced_new_file/completions/fuzzy_sort.py
+++ b/advanced_new_file/completions/fuzzy_sort.py
@@ -1,7 +1,7 @@
 from operator import itemgetter
 # import numpy as np
 
-def sort_by_fuzzy(query, choices):
+def sort_by_fuzzy(query, choices, limit:int = 0):
     if not query or not choices:
         return choices
     choices_ratio = {}
@@ -9,7 +9,11 @@ def sort_by_fuzzy(query, choices):
         choices_ratio[choice] = levenshtein_ratio(query, choice)
 
     # print(choices_ratio)
-    return [key[0] for key in sorted(choices_ratio.items(), key=itemgetter(1), reverse=True)]
+    result = [key[0] for key in sorted(choices_ratio.items(), key=itemgetter(1), reverse=True)]
+    if limit > 0 and len(result) > limit:
+        return result[0:limit]
+    else:
+        return result
 
 def levenshtein_ratio(s, t):
     """ levenshtein_ratio_and_distance:
diff --git a/advanced_new_file/reloader.py b/advanced_new_file/reloader.py
index f47194e..72d9556 100644
--- a/advanced_new_file/reloader.py
+++ b/advanced_new_file/reloader.py
@@ -48,10 +48,12 @@
     ".commands.duplicate_file_base",
     ".commands.helper_commands",
     '.commands.new_file_command',
+    ".commands.project_file_command",
     ".commands.move_file_command",
     ".commands.delete_file_command",
     ".commands.copy_file_command",
-    ".commands.cut_to_file"
+    ".commands.cut_to_file",
+
 ]
 
 for suffix in mods_load_order:

From c4dcae71546cf16b0a059b1344bd4ec9619fdd46 Mon Sep 17 00:00:00 2001
From: yangwen0228 <yangwen0228@foxmail.com>
Date: Fri, 6 May 2022 22:17:19 +0800
Subject: [PATCH 4/5] Focus the opened file view always.

---
 advanced_new_file/commands/new_file_command.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/advanced_new_file/commands/new_file_command.py b/advanced_new_file/commands/new_file_command.py
index fc6be50..8738188 100644
--- a/advanced_new_file/commands/new_file_command.py
+++ b/advanced_new_file/commands/new_file_command.py
@@ -246,6 +246,7 @@ def on_load(self, view):
                 else:
                     view.run_command("insert_snippet", {"contents": template})
             view.settings().set("_anf_new", "")
+        sublime.active_window().focus_view(view)
 
     def get_basename(self, path):
         return os.path.basename(os.path.expanduser(path))

From 26a17b3255e47406a2043e0428043c3c05a8e8d5 Mon Sep 17 00:00:00 2001
From: yangwen0228 <yangwen0228@foxmail.com>
Date: Tue, 10 May 2022 23:54:21 +0800
Subject: [PATCH 5/5] Performance improved by using functools.partial, and also
 support ~/ and / in anywhere.

---
 AdvancedNewFile.sublime-settings              | 11 +++++-
 Default.sublime-commands                      |  3 +-
 README.md                                     | 10 +++++
 advanced_new_file/anf_util.py                 |  6 ++-
 advanced_new_file/commands/command_base.py    | 37 ++++++++++++++++---
 .../commands/project_file_command.py          |  5 ++-
 .../completions/completion_base.py            | 13 ++-----
 advanced_new_file/completions/fuzzy_sort.py   | 16 ++++----
 advanced_new_file/completions/pinyin_lib.py   | 20 ++++++----
 9 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/AdvancedNewFile.sublime-settings b/AdvancedNewFile.sublime-settings
index 74da2e0..874554c 100644
--- a/AdvancedNewFile.sublime-settings
+++ b/AdvancedNewFile.sublime-settings
@@ -181,6 +181,13 @@
     // When specifying initial input, this boolean will place the cursor prior to the .<content>
     "cursor_before_extension": false,
 
-    // Ignore regex patters
-    "filter_regex": ["\\.DS_Store", "\\.git"]
+    // Ignore regex patterns
+    "filter_regex": ["\\.DS_Store", "\\.git"],
+
+    // Use Chinese Pinyin to filter candidate in completion list
+    "use_pinyin_to_filter": false,
+
+    // miliseconds to delay when input char to complete.
+    // This only work for project file, because some projects maybe very large.
+    "completion_after_milliseconds": 100
 }
diff --git a/Default.sublime-commands b/Default.sublime-commands
index 08ff538..aa32511 100644
--- a/Default.sublime-commands
+++ b/Default.sublime-commands
@@ -4,5 +4,6 @@
   { "caption": "ANF: Delete File", "command": "advanced_new_file_delete"},
   { "caption": "ANF: Delete Current File", "command": "advanced_new_file_delete", "args": {"current": true}},
   { "caption": "ANF: Copy Current File", "command": "advanced_new_file_copy" },
-  { "caption": "ANF: Cut to File", "command": "advanced_new_file_cut_to_file" }
+  { "caption": "ANF: Cut to File", "command": "advanced_new_file_cut_to_file" },
+  { "caption": "ANF: Project File", "command": "advanced_new_file_project_file" }
 ]
diff --git a/README.md b/README.md
index d912a2b..35e49b2 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,12 @@ The plugin does not contain any menu commands by default. To add them yourself,
 ## Keymaps
 If you have issues with keymaps, consider running [FindKeyConflicts](https://github.com/skuroda/FindKeyConflicts), also available through the package manager. Alternatively, set command logging to true by entering `sublime.log_commands(True)` in the Sublime Text console.
 
+- `tab` or `ctrl+j` to choose the first candidate
+- `ctrl+n` change to the next candidate in the completion list
+- `ctrl+p` change to the prev candidate in the completion list
+- `ctrl+l` change to the updir of the input path
+- `enter` choose the first candidate when popup, otherwise confirm(finish) the operation when no popup
+
 ### Windows
 `ctrl+alt+n`: General keymap to create new files.
 
@@ -273,6 +279,10 @@ In Sublime Text 2, the name of the folder will be the actual name of the folder,
 ###### Current Working Directory
 To specify the current working directory, simply type a colon, without any preceding text. Alternatively, set `relative_from_current` to `true` in your settings. Paths specified as relative paths will then begin from the current working directory.
 
+## TODO
+### project scope settings
+`filter_regex` and `use_pinyin_to_filter` settings are project related. We can set these in `.sublime-project` file for project specific.
+
 ## Notes
 Thanks to Dima Kukushkin ([xobb1t](https://github.com/xobb1t)) for the original work on this plugin. Also, thank you to [facelessuser](https://github.com/facelessuser), and by extension biermeester and matthjes for the idea of platform specific settings. Additional thanks to [kemayo](https://github.com/kemayo) for the work in identifying git executable.
 
diff --git a/advanced_new_file/anf_util.py b/advanced_new_file/anf_util.py
index 05d60a4..5fee2db 100644
--- a/advanced_new_file/anf_util.py
+++ b/advanced_new_file/anf_util.py
@@ -41,6 +41,8 @@
 DEFAULT_NEW_FILE = "empty_filename_action"
 CURSOR_BEFORE_EXTENSION_SETTING = "cursor_before_extension"
 FILTER_REGEX_SETTING = "filter_regex"
+USE_PINYIN_TO_FILTER_SETTING = "use_pinyin_to_filter"
+COMPLETION_DELAY_SETTING = "completion_after_milliseconds"
 
 
 SETTINGS = [
@@ -82,7 +84,9 @@
     COPY_FILE_DEFAULT_ROOT_SETTING,
     DEFAULT_NEW_FILE,
     CURSOR_BEFORE_EXTENSION_SETTING,
-    FILTER_REGEX_SETTING
+    FILTER_REGEX_SETTING,
+    USE_PINYIN_TO_FILTER_SETTING,
+    COMPLETION_DELAY_SETTING,
 ]
 
 NIX_ROOT_REGEX = r"^/"
diff --git a/advanced_new_file/commands/command_base.py b/advanced_new_file/commands/command_base.py
index 492d58b..c1bfdc9 100644
--- a/advanced_new_file/commands/command_base.py
+++ b/advanced_new_file/commands/command_base.py
@@ -1,4 +1,5 @@
 import errno
+import functools
 import os
 import re
 import sublime
@@ -300,9 +301,11 @@ def clear_input_view_content(self):
     def clear_input_view_project_files(self):
         self.get_active_view_settings().erase("anf_input_view_project_files")
 
-    def show_filename_input(self, initial):
+    def show_filename_input(self, initial, completion_delay=0):
         caption = self.input_panel_caption()
 
+        self.input_char_count = 0
+        self.completion_delay = completion_delay
         self.input_panel_view = self.window.show_input_panel(
             caption, initial,
             self.on_done, self.__update_filename_input, self.clear
@@ -320,6 +323,19 @@ def show_filename_input(self, initial):
         self.__update_filename_input(initial)
 
     def __update_filename_input(self, path_in):
+        self.input_char_count += 1
+        if not path_in or path_in.endswith("\t") or path_in.endswith("\n"):
+            self.__update_filename_input_lazy(path_in, self.input_char_count)
+        else:
+            sublime.set_timeout(
+                functools.partial(self.__update_filename_input_lazy, path_in, self.input_char_count),
+                self.completion_delay)
+
+    def __update_filename_input_lazy(self, path_in, count):
+        if self.input_char_count != count:
+            return
+        self.input_char_count = 0
+
         new_content = path_in
         if self.settings.get(COMPLETION_TYPE_SETTING) == "windows":
             if "prev_text" in dir(self) and self.prev_text != path_in:
@@ -327,17 +343,25 @@ def __update_filename_input(self, path_in):
                     self.view.erase_status("AdvancedNewFile2")
 
         input_view = self.get_input_view()
+        if '/~/' in path_in:
+            index = path_in.rindex('/~/')
+            new_content = path_in[index + 1:]
+        if '//' in path_in:
+            index = path_in.rindex('//')
+            new_content = path_in[index + 1:]
+        if input_view and new_content != path_in:
+            input_view.run_command("anf_replace", {"content": new_content})
+            return
+
         if path_in.endswith("\t"):
             creation_path, candidate, completion_list = self.get_input_view_content()
             new_content = self.completion_input(path_in.replace("\n", "").replace("\t", ""), candidate)
         elif path_in.endswith("\n"):
-            path_in = path_in.replace("\n", "")
+            path_in = path_in.replace("\t", "").replace("\n", "")
             if input_view:
-                # print("visible", input_view.is_popup_visible())
                 if input_view.is_popup_visible():
                     input_view.run_command("insert", {"characters": "\t"})
                 else:
-                    # print("end panel")
                     self.on_done(path_in)
                     self.window.run_command("hide_panel", {"cancel": True})
             return
@@ -510,7 +534,10 @@ def get_cursor_path(self):
                 path = re.sub('^"|\'', '',  re.sub('"|\'$', '', path.strip()))
                 break
 
-        return path
+        if "/" in path:
+            return path
+        else:
+            return ""
 
     def _expand_default_path(self, path):
         current_file = self.view.file_name()
diff --git a/advanced_new_file/commands/project_file_command.py b/advanced_new_file/commands/project_file_command.py
index bbeb5c8..5bc5a03 100644
--- a/advanced_new_file/commands/project_file_command.py
+++ b/advanced_new_file/commands/project_file_command.py
@@ -16,7 +16,10 @@ def __init__(self, window):
     def run(self, is_python=False, initial_path=None):
         self.is_python = is_python
         self.run_setup()
-        self.show_filename_input(self.generate_initial_path(initial_path))
+        print(self.settings)
+        completion_delay = self.settings.get(COMPLETION_DELAY_SETTING, 100)
+        print(completion_delay)
+        self.show_filename_input(self.generate_initial_path(initial_path), completion_delay)
 
     def get_project_folder(self):
         return sublime.active_window().folders()[0]
diff --git a/advanced_new_file/completions/completion_base.py b/advanced_new_file/completions/completion_base.py
index 05c38ba..ec37eae 100644
--- a/advanced_new_file/completions/completion_base.py
+++ b/advanced_new_file/completions/completion_base.py
@@ -99,13 +99,9 @@ def generate_auto_complete(self, base, iterable_var):
         return sugg
 
     def compare_entries(self, compare_entry, compare_base):
-        # if self.settings.get(IGNORE_CASE_SETTING):
-        #     compare_entry = compare_entry.lower()
-        #     compare_base = compare_base.lower()
-
-        # return compare_entry.startswith(compare_base)
-        # turn to fuzzy match
-        pattern = get_str_pattern(compare_base, self.settings.get(IGNORE_CASE_SETTING, True))
+        # fuzzy match
+        pattern = get_str_pattern(compare_base, self.settings.get(IGNORE_CASE_SETTING, True),
+            self.settings.get(USE_PINYIN_TO_FILTER_SETTING, False))
         return re.match(pattern, compare_entry) is not None
 
     def complete_for_folder(self, path_in):
@@ -131,8 +127,7 @@ def complete_for_project(self, path_in):
             if not files:
                 files = self.get_files_recursively(directory, self.filter_file)
                 self.command.set_input_view_project_files(files)
-            else:
-                print("use the old files", str(len(files)))
+
             for file in files:
                 if self.compare_entries(os.path.basename(file), path_in):
                     completion_list.append(file)
diff --git a/advanced_new_file/completions/fuzzy_sort.py b/advanced_new_file/completions/fuzzy_sort.py
index c6d562d..0af944f 100644
--- a/advanced_new_file/completions/fuzzy_sort.py
+++ b/advanced_new_file/completions/fuzzy_sort.py
@@ -2,14 +2,16 @@
 # import numpy as np
 
 def sort_by_fuzzy(query, choices, limit:int = 0):
-    if not query or not choices:
-        return choices
-    choices_ratio = {}
-    for choice in choices:
-        choices_ratio[choice] = levenshtein_ratio(query, choice)
+    if not choices:
+        return []
+    if not query:
+        result = choices
+    else:
+        choices_ratio = {}
+        for choice in choices:
+            choices_ratio[choice] = levenshtein_ratio(query, choice)
+        result = [key[0] for key in sorted(choices_ratio.items(), key=itemgetter(1), reverse=True)]
 
-    # print(choices_ratio)
-    result = [key[0] for key in sorted(choices_ratio.items(), key=itemgetter(1), reverse=True)]
     if limit > 0 and len(result) > limit:
         return result[0:limit]
     else:
diff --git a/advanced_new_file/completions/pinyin_lib.py b/advanced_new_file/completions/pinyin_lib.py
index 1befe2d..7d6a607 100644
--- a/advanced_new_file/completions/pinyin_lib.py
+++ b/advanced_new_file/completions/pinyin_lib.py
@@ -35,26 +35,32 @@
     PINYINLIB_SIMPLIFIED_CHAR_PATTERN.append('|'.join([c for c in PINYINLIB_SIMPLIFIED_CHAR_LIST[i]]))
     # print('|'.join([c for c in PINYINLIB_SIMPLIFIED_CHAR_LIST[i]]))
 
-def get_char_pattern(ch, ignore_case=True):
+def get_char_pattern(ch, ignore_case=True, use_pinyin=False):
     result = ''
     if ord(ch) >= ord('a') and ord(ch) <= ord('z'):
+        result += ch + '|'
         if ignore_case:
             result += chr(ord(ch) - ord('a') + ord('A')) + '|'
-        result += ch + '|' + PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('a')]
+        if use_pinyin:
+            result += PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('a')]
+        if result.endswith('|'):
+            result = result[0:-1]
     elif ord(ch) >= ord('A') and ord(ch) <= ord('Z'):
+        result += ch + '|'
         if ignore_case:
             result += chr(ord(ch) - ord('A') + ord('a')) + '|'
-        result += ch + '|' + PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('A')]
+        if use_pinyin:
+            result += PINYINLIB_SIMPLIFIED_CHAR_PATTERN[ord(ch) - ord('A')]
+        if result.endswith('|'):
+            result = result[0:-1]
     else:
         result = ch
-    if result.endswith('|'):
-        result = result[0:-1]
     return result
 
-def get_str_pattern(st, ignore_case=True):
+def get_str_pattern(st, ignore_case=True, use_pinyin=False):
     result = '.*'
     for c in st:
-        result += '(' + get_char_pattern(c, ignore_case) + ').*'
+        result += '(' + get_char_pattern(c, ignore_case, use_pinyin) + ').*'
     return result