Merge pull request adobe#3301 from WebsiteDeveloper/CssInlineEditor

DennisKehrig · DennisKehrig · commit 28b9980bb352 · 2013-03-31T03:33:25.000-07:00
Another two straightforward refactoring tasks for Language support
diff --git a/src/editor/CSSInlineEditor.js b/src/editor/CSSInlineEditor.js
@@ -90,7 +90,7 @@ define(function (require, exports, module) {
      */
     function htmlToCSSProvider(hostEditor, pos) {
         // Only provide a CSS editor when cursor is in HTML content
-        if (hostEditor.getModeForSelection() !== "html") {
+        if (hostEditor.getLanguageForSelection().getId() !== "html") {
             return null;
         }
         
diff --git a/src/extensions/default/QuickOpenCSS/main.js b/src/extensions/default/QuickOpenCSS/main.js
@@ -116,7 +116,7 @@ define(function (require, exports, module) {
     QuickOpen.addQuickOpenPlugin(
         {
             name: "CSS Selectors",
-            fileTypes: ["css"],
+            languageIds: ["css"],
             done: function () {},
             search: search,
             match: match,
diff --git a/src/extensions/default/QuickOpenHTML/main.js b/src/extensions/default/QuickOpenHTML/main.js
@@ -149,7 +149,7 @@ define(function (require, exports, module) {
     QuickOpen.addQuickOpenPlugin(
         {
             name: "html ids",
-            fileTypes: ["html"],
+            languageIds: ["html"],
             done: function () {},
             search: search,
             match: match,
diff --git a/src/extensions/default/QuickOpenJavaScript/main.js b/src/extensions/default/QuickOpenJavaScript/main.js
@@ -143,7 +143,7 @@ define(function (require, exports, module) {
     QuickOpen.addQuickOpenPlugin(
         {
             name: "JavaScript functions",
-            fileTypes: ["js"],
+            languageIds: ["javascript"],
             done: function () {},
             search: search,
             match: match,
diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
@@ -48,6 +48,7 @@ define(function (require, exports, module) {
         StringUtils         = require("utils/StringUtils"),
         Commands            = require("command/Commands"),
         ProjectManager      = require("project/ProjectManager"),
+        LanguageManager     = require("language/LanguageManager"),
         KeyEvent            = require("utils/KeyEvent"),
         ModalBar            = require("widgets/ModalBar").ModalBar,
         StringMatch         = require("utils/StringMatch");
@@ -97,9 +98,9 @@ define(function (require, exports, module) {
     /**
      * Defines API for new QuickOpen plug-ins
      */
-    function QuickOpenPlugin(name, fileTypes, done, search, match, itemFocus, itemSelect, resultsFormatter) {
+    function QuickOpenPlugin(name, languageIds, done, search, match, itemFocus, itemSelect, resultsFormatter) {
         this.name = name;
-        this.fileTypes = fileTypes;
+        this.languageIds = languageIds;
         this.done = done;
         this.search = search;
         this.match = match;
@@ -112,7 +113,7 @@ define(function (require, exports, module) {
      * Creates and registers a new QuickOpenPlugin
      *
      * @param { name: string, 
-     *          fileTypes:Array.<string>,
+     *          languageIds:Array.<string>,
      *          done: function(),
      *          search: function(string, !StringMatch.StringMatcher):Array.<SearchResult|string>,
      *          match: function(string):boolean,
@@ -124,8 +125,8 @@ define(function (require, exports, module) {
      * Parameter Documentation:
      *
      * name - plug-in name, **must be unique**
-     * fileTypes - file types array. Example: ["js", "css", "txt"]. An empty array
-     *      indicates all file types.
+     * languageIds - language Ids array. Example: ["javascript", "css", "html"]. An empty array
+     *      indicates all language IDs.
      * done - called when quick open is complete. Plug-in should clear its internal state.
      * search - takes a query string and a StringMatcher (the use of which is optional but can speed up your searches) and returns an array of strings that match the query.
      * match - takes a query string and returns true if this plug-in wants to provide
@@ -141,9 +142,17 @@ define(function (require, exports, module) {
      * cancels Quick Open (via Esc), those changes are automatically reverted.
      */
     function addQuickOpenPlugin(pluginDef) {
+        if (pluginDef.fileTypes) {
+            console.warn("Using fileTypes for QuickOpen plugins is deprecated. Use languageIds instead.");
+            pluginDef.languageIds = pluginDef.fileTypes.map(function (extension) {
+                return LanguageManager.getLanguageForPath("file." + extension).getId();
+            });
+            delete pluginDef.fileTypes;
+        }
+        
         plugins.push(new QuickOpenPlugin(
             pluginDef.name,
-            pluginDef.fileTypes,
+            pluginDef.languageIds,
             pluginDef.done,
             pluginDef.search,
             pluginDef.match,
@@ -529,14 +538,13 @@ define(function (require, exports, module) {
         // Try to invoke a search plugin
         var curDoc = DocumentManager.getCurrentDocument();
         if (curDoc) {
-            var filename = _filenameFromPath(curDoc.file.fullPath, true);
-            var extension = filename.slice(filename.lastIndexOf(".") + 1, filename.length);
+            var languageId = curDoc.getLanguage().getId();
 
             var i;
             for (i = 0; i < plugins.length; i++) {
                 var plugin = plugins[i];
-                var extensionMatch = plugin.fileTypes.indexOf(extension) !== -1 || plugin.fileTypes.length === 0;
-                if (extensionMatch &&  plugin.match && plugin.match(query)) {
+                var LanguageIdMatch = plugin.languageIds.indexOf(languageId) !== -1 || plugin.languageIds.length === 0;
+                if (LanguageIdMatch && plugin.match && plugin.match(query)) {
                     currentPlugin = plugin;
                     
                     // Look up the StringMatcher for this plugin.

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ define(function (require, exports, module) {`
`90`	`90`	`*/`
`91`	`91`	`function htmlToCSSProvider(hostEditor, pos) {`
`92`	`92`	`// Only provide a CSS editor when cursor is in HTML content`
`93`		`- if (hostEditor.getModeForSelection() !== "html") {`
	`93`	`+ if (hostEditor.getLanguageForSelection().getId() !== "html") {`
`94`	`94`	`return null;`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ define(function (require, exports, module) {`
`116`	`116`	`QuickOpen.addQuickOpenPlugin(`
`117`	`117`	`{`
`118`	`118`	`name: "CSS Selectors",`
`119`		`- fileTypes: ["css"],`
	`119`	`+ languageIds: ["css"],`
`120`	`120`	`done: function () {},`
`121`	`121`	`search: search,`
`122`	`122`	`match: match,`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ define(function (require, exports, module) {`
`149`	`149`	`QuickOpen.addQuickOpenPlugin(`
`150`	`150`	`{`
`151`	`151`	`name: "html ids",`
`152`		`- fileTypes: ["html"],`
	`152`	`+ languageIds: ["html"],`
`153`	`153`	`done: function () {},`
`154`	`154`	`search: search,`
`155`	`155`	`match: match,`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ define(function (require, exports, module) {`
`143`	`143`	`QuickOpen.addQuickOpenPlugin(`
`144`	`144`	`{`
`145`	`145`	`name: "JavaScript functions",`
`146`		`- fileTypes: ["js"],`
	`146`	`+ languageIds: ["javascript"],`
`147`	`147`	`done: function () {},`
`148`	`148`	`search: search,`
`149`	`149`	`match: match,`