Added find names in file

aam · Jun 16, 2014 · 8eda385 · 8eda385
1 parent 8d06be2
commit 8eda385
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 3 deletions.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -3,4 +3,5 @@
 	{ "keys": ["ctrl+alt+m"], "command": "cfserver_find_macros" },
 	{ "keys": ["ctrl+alt+g"], "command": "cfserver_find_strings" },
 	{ "keys": ["ctrl+alt+f"], "command": "cfserver_find_files" },
+	{ "keys": ["ctrl+f12"], "command": "cfserver_find_names_in_file" },
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -3,4 +3,5 @@
 	{ "keys": ["ctrl+alt+m"], "command": "cfserver_find_macros" },
 	{ "keys": ["ctrl+alt+g"], "command": "cfserver_find_strings" },
 	{ "keys": ["ctrl+alt+f"], "command": "cfserver_find_files" },
+	{ "keys": ["ctrl+f12"], "command": "cfserver_find_names_in_file" },
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -3,4 +3,5 @@
 	{ "keys": ["ctrl+alt+m"], "command": "cfserver_find_macros" },
 	{ "keys": ["ctrl+alt+g"], "command": "cfserver_find_strings" },
 	{ "keys": ["ctrl+alt+f"], "command": "cfserver_find_files" },
+	{ "keys": ["ctrl+f12"], "command": "cfserver_find_names_in_file" },
 ]
diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -12,20 +12,25 @@
 				"command": "cfserver_find_names",
 				"mnemonic": "n"
 			},
+			{
+				"caption": "Find C/C++ names in file...",
+				"command": "cfserver_find_names_in_file",
+				"mnemonic": "a"
+			},
 			{
 				"caption": "Find C/C++ macros...",
 				"command": "cfserver_find_macros",
-				"mnemonic": "n"
+				"mnemonic": "m"
 			},
 			{
 				"caption": "Find C/C++ files...",
 				"command": "cfserver_find_files",
-				"mnemonic": "n"
+				"mnemonic": "f"
 			},
 			{
 				"caption": "Find C/C++ strings...",
 				"command": "cfserver_find_strings",
-				"mnemonic": "n"
+				"mnemonic": "s"
 			},
 		]
 

diff --git a/linter.py b/linter.py
@@ -712,6 +712,25 @@ def __init__(self, view):
         self.set_find_command("find-names")
 
 
+class CfserverFindNamesInFile(CfserverFind):
+
+    def handler(self):
+        return UsagesNamesHandler()
+
+    def command(self):
+        view = self.view
+
+        return "%s \"%s\" \"\"" % (
+                self.find_command,
+                view.file_name().replace("\\", "\\\\"))
+
+        return "%s \"%s\" \"%s\"" % (self.find_command, "", "system")
+
+    def __init__(self, view):
+        super().__init__(view)
+        self.set_find_command("find-names-in-file")
+
+
 class CfserverFindMacros(CfserverGlobalFind):
 
     def __init__(self, view):

diff --git a/messages.json b/messages.json
@@ -1,3 +1,4 @@
 {
 	"0.0.3": "messages/0.0.3.txt",
+	"0.0.4": "messages/0.0.4.txt",
 }
diff --git a/messages/0.0.4.txt b/messages/0.0.4.txt
@@ -0,0 +1,4 @@
+Cfserver Sublime plugin 0.0.4
+-----------------------------
+
+- String/file/macro navigation command added