Compatibility with Komodo 6 toolbox -- not as flexible as the old ver…

…sion, no option to have ":" in the snippet name and no support for folders.
StanAngeloff · Jun 21, 2010 · bd07c04 · bd07c04
1 parent 008c33d
commit bd07c04
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 61 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-*.kpf
+*.komodoproject
 *.pyo
diff --git a/src/content/scripts/command/abbreviation/toolbox.js b/src/content/scripts/command/abbreviation/toolbox.js
@@ -37,66 +37,73 @@ $self.provider = function() {
 		if (viewLanguages.indexOf('General') < 0)
 			viewLanguages.push('General');
 
-		var partService = Cc['@activestate.com/koPartService;1'].getService(Ci.koIPartService),
-			abbreviationsFolders = partService.getParts('folder', 'name', 'Abbreviations', '*', partService.currentProject, {}),
-			abbreviationName = abbreviation.split('.').shift(),
-			languageContainers, languageSnippetsContainer, languageSnippets;
-
-		for (var i = 0; i < abbreviationsFolders.length; i ++)
-			for (var j = 0; j < viewLanguages.length; j ++) {
-
-				// Find all sub-folders at top level
-				languageContainers = {};
-				abbreviationsFolders[i].getChildrenByType('folder', false, languageContainers, {});
-				if (languageContainers.value) {
-
-					languageContainers = languageContainers.value;
-
-					// Match the view language against the name of each folder
-					languageSnippetsContainer = null;
-					for (var k = 0; k < languageContainers.length; k ++)
-						if (viewLanguages[j].toLowerCase() === languageContainers[k].name.toLowerCase()) {
-
-							languageSnippetsContainer = languageContainers[k];
-							break;
-						}
-
-					// If we have found a folder matching our view language, look for a snippet inside
-					if (languageSnippetsContainer) {
-
-						languageSnippets = {};
-						// Find all snippets (incl. nested folders) inside the view language folder
-						languageSnippetsContainer.getChildrenByType('snippet', true, languageSnippets, {});
-						if (languageSnippets.value) {
-
-							languageSnippets = languageSnippets.value;
-							for (k = 0; k < languageSnippets.length; k ++) {
-
-								// Attempt a full-name match
-								if (languageSnippets[k].name == abbreviationName)
-									return languageSnippets[k];
-								// Attempt to match first word-part of the snippet name
-								else if (languageSnippets[k].name.split(/[\W\.]+/).shift() == abbreviationName)
-									return languageSnippets[k];
-							}
-						}
-
-						languageSnippets = {};
-						// Find all folders (incl. nested folders) inside the view language folder
-						languageSnippetsContainer.getChildrenByType('folder', true, languageSnippets, {});
-						if (languageSnippets.value) {
-
-							languageSnippets = languageSnippets.value;
-							for (k = 0; k < languageSnippets.length; k ++) {
-
-								// Attempt a full-name match
-								if (languageSnippets[k].name == abbreviationName)
-									return languageSnippets[k];
-							}
-						}
-					}
-				}
-			}
+        if (typeof (ko.toolbox2) === 'undefined') {
+
+            var partService = Cc['@activestate.com/koPartService;1'].getService(Ci.koIPartService),
+                abbreviationsFolders = partService.getParts('folder', 'name', 'Abbreviations', '*', partService.currentProject, {}),
+                abbreviationName = abbreviation.split('.').shift(),
+                languageContainers, languageSnippetsContainer, languageSnippets;
+
+            for (var i = 0; i < abbreviationsFolders.length; i ++)
+                for (var j = 0; j < viewLanguages.length; j ++) {
+
+                    // Find all sub-folders at top level
+                    languageContainers = {};
+                    abbreviationsFolders[i].getChildrenByType('folder', false, languageContainers, {});
+                    if (languageContainers.value) {
+
+                        languageContainers = languageContainers.value;
+
+                        // Match the view language against the name of each folder
+                        languageSnippetsContainer = null;
+                        for (var k = 0; k < languageContainers.length; k ++)
+                            if (viewLanguages[j].toLowerCase() === languageContainers[k].name.toLowerCase()) {
+
+                                languageSnippetsContainer = languageContainers[k];
+                                break;
+                            }
+
+                        // If we have found a folder matching our view language, look for a snippet inside
+                        if (languageSnippetsContainer) {
+
+                            languageSnippets = {};
+                            // Find all snippets (incl. nested folders) inside the view language folder
+                            languageSnippetsContainer.getChildrenByType('snippet', true, languageSnippets, {});
+                            if (languageSnippets.value) {
+
+                                languageSnippets = languageSnippets.value;
+                                for (k = 0; k < languageSnippets.length; k ++) {
+
+                                    // Attempt a full-name match
+                                    if (languageSnippets[k].name == abbreviationName)
+                                        return languageSnippets[k];
+                                    // Attempt to match first word-part of the snippet name
+                                    else if (languageSnippets[k].name.split(/[\W\.]+/).shift() == abbreviationName)
+                                        return languageSnippets[k];
+                                }
+                            }
+
+                            languageSnippets = {};
+                            // Find all folders (incl. nested folders) inside the view language folder
+                            languageSnippetsContainer.getChildrenByType('folder', true, languageSnippets, {});
+                            if (languageSnippets.value) {
+
+                                languageSnippets = languageSnippets.value;
+                                for (k = 0; k < languageSnippets.length; k ++) {
+
+                                    // Attempt a full-name match
+                                    if (languageSnippets[k].name == abbreviationName)
+                                        return languageSnippets[k];
+                                }
+                            }
+                        }
+                    }
+                }
+
+        } else {
+
+            return ko.toolbox2.getAbbreviationSnippet(abbreviation, viewLanguages);
+        }
 
 		return null;
 	};