Merge pull request #9640 from le717/remove-more-deprecated

ingorichter · ingorichter · commit d2d9e5012c05 · 2014-10-23T11:21:45.000-07:00
Remove even more deprecated code
diff --git a/src/command/Commands.js b/src/command/Commands.js
@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"), 
  * to deal in the Software without restriction, including without limitation 
  * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
  * and/or sell copies of the Software, and to permit persons to whom the 
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 
@@ -176,16 +176,5 @@ define(function (require, exports, module) {
     DeprecationWarning.deprecateConstant(exports, "SORT_WORKINGSET_BY_NAME",    "CMD_WORKINGSET_SORT_BY_NAME");
     DeprecationWarning.deprecateConstant(exports, "SORT_WORKINGSET_BY_TYPE",    "CMD_WORKINGSET_SORT_BY_TYPE");
     DeprecationWarning.deprecateConstant(exports, "SORT_WORKINGSET_AUTO",       "CMD_WORKING_SORT_TOGGLE_AUTO");
-              
-    // DEPRECATED: Edit commands that were moved from the Edit Menu to the Find Menu
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND",                  "CMD_FIND");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND_IN_SELECTED",      "CMD_FIND_IN_SELECTED");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND_IN_SUBTREE",       "CMD_FIND_IN_SUBTREE");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND_NEXT",             "CMD_FIND_NEXT");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND_PREVIOUS",         "CMD_FIND_PREVIOUS");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_FIND_ALL_AND_SELECT",   "CMD_FIND_ALL_AND_SELECT");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_ADD_NEXT_MATCH",        "CMD_ADD_NEXT_MATCH");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_SKIP_CURRENT_MATCH",    "CMD_SKIP_CURRENT_MATCH");
-    DeprecationWarning.deprecateConstant(exports, "EDIT_REPLACE",               "CMD_REPLACE");
 });
 
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -94,10 +94,6 @@ define(function (require, exports, module) {
         EDIT_CODE_HINTS_COMMANDS:           {sectionMarker: Commands.SHOW_CODE_HINTS},
         EDIT_TOGGLE_OPTIONS:                {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
         
-        // DEPRECATED: Old Edit menu sections redirected to existing Edit menu section
-        EDIT_FIND_COMMANDS:                 {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
-        EDIT_REPLACE_COMMANDS:              {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
-        
         FIND_FIND_COMMANDS:                 {sectionMarker: Commands.CMD_FIND},
         FIND_FIND_IN_COMMANDS:              {sectionMarker: Commands.CMD_FIND_IN_FILES},
         FIND_REPLACE_COMMANDS:              {sectionMarker: Commands.CMD_REPLACE},
@@ -558,14 +554,6 @@ define(function (require, exports, module) {
             name,
             commandID;
         
-        if (relativeID === MenuSection.EDIT_FIND_COMMANDS) {
-            DeprecationWarning.deprecationWarning("Add " + command + " Command to the Find Menu instead of the Edit Menu.", true);
-            DeprecationWarning.deprecationWarning("Use MenuSection.FIND_FIND_COMMANDS instead of MenuSection.EDIT_FIND_COMMANDS.", true);
-        } else if (relativeID === MenuSection.EDIT_REPLACE_COMMANDS) {
-            DeprecationWarning.deprecationWarning("Add " + command + " Command to the Find Menu instead of the Edit Menu.", true);
-            DeprecationWarning.deprecationWarning("Use MenuSection.FIND_REPLACE_COMMANDS instead of MenuSection.EDIT_REPLACE_COMMANDS.", true);
-        }
-        
         if (!command) {
             console.error("addMenuItem(): missing required parameters: command");
             return null;
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -838,7 +838,6 @@ define(function (require, exports, module) {
         
         // Redispatch these CodeMirror key events as jQuery events
         function _onKeyEvent(instance, event) {
-            $(self).triggerHandler("keyEvent", [self, event]);  // deprecated
             $(self).triggerHandler(event.type, [self, event]);
             return event.defaultPrevented;   // false tells CodeMirror we didn't eat the event
         }
diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
@@ -145,15 +145,6 @@ define(function (require, exports, module) {
      * cancels Quick Open (via Esc), those changes are automatically reverted.
      */
     function addQuickOpenPlugin(pluginDef) {
-        // Backwards compatibility (for now) for old fileTypes field, if newer languageIds not specified
-        if (pluginDef.fileTypes && !pluginDef.languageIds) {
-            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.languageIds,
@@ -958,10 +949,4 @@ define(function (require, exports, module) {
     exports.beginSearch             = beginSearch;
     exports.addQuickOpenPlugin      = addQuickOpenPlugin;
     exports.highlightMatch          = highlightMatch;
-    
-    // accessing these from this module will ultimately be deprecated
-    exports.stringMatch             = StringMatch.stringMatch;
-    exports.SearchResult            = StringMatch.SearchResult;
-    exports.basicMatchSort          = StringMatch.basicMatchSort;
-    exports.multiFieldSort          = StringMatch.multiFieldSort;
 });

Original file line number	Diff line number	Diff line change
`@@ -838,7 +838,6 @@ define(function (require, exports, module) {`
`838`	`838`
`839`	`839`	`// Redispatch these CodeMirror key events as jQuery events`
`840`	`840`	`function _onKeyEvent(instance, event) {`
`841`		`- $(self).triggerHandler("keyEvent", [self, event]); // deprecated`
`842`	`841`	`$(self).triggerHandler(event.type, [self, event]);`
`843`	`842`	`return event.defaultPrevented; // false tells CodeMirror we didn't eat the event`
`844`	`843`	`}`