adobe
diff --git a/‎src/editor/Editor.js
Copy file name to clipboard
+152-9Lines changed: 152 additions & 9 deletions b/‎src/editor/Editor.js
Copy file name to clipboard
+152-9Lines changed: 152 additions & 9 deletions
diff --git a/‎src/extensions/default/CodeFolding/foldhelpers/foldcode.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/extensions/default/CodeFolding/foldhelpers/foldcode.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/extensions/default/CodeFolding/foldhelpers/foldgutter.js
Copy file name to clipboard
+1-18Lines changed: 1 addition & 18 deletions b/‎src/extensions/default/CodeFolding/foldhelpers/foldgutter.js
Copy file name to clipboard
+1-18Lines changed: 1 addition & 18 deletions
@@ -97,7 +97,13 @@ define(function (require, exports, module) {
         USE_TAB_CHAR        = "useTabChar",
         WORD_WRAP           = "wordWrap",
         INDENT_LINE_COMMENT   = "indentLineComment";
-    
+
+    /**
+      * A list of gutter name and priorities currently registered for editors.
+      * The line number gutter is defined as { name: LINE_NUMBER_GUTTER, priority: 100 }
+      * @type {Array.<{name: string, priority: number, languageIds: Array}}
+      */
+    var registeredGutters = [];
 
     var cmOptions         = {};
 
@@ -112,6 +118,10 @@ define(function (require, exports, module) {
         MAX_SPACE_UNITS         = 10,
         MAX_TAB_SIZE            = 10;
 
+    var LINE_NUMBER_GUTTER = "CodeMirror-linenumbers",
+        LINE_NUMBER_GUTTER_PRIORITY     = 100,
+        CODE_FOLDING_GUTTER_PRIORITY    = 1000;
+
     // Mappings from Brackets preferences to CodeMirror options
     cmOptions[CLOSE_BRACKETS]     = "autoCloseBrackets";
     cmOptions[CLOSE_TAGS]         = "autoCloseTags";
@@ -210,12 +220,11 @@ define(function (require, exports, module) {
     PreferencesManager.definePreference(WORD_WRAP,          "boolean", true, {
         description: Strings.DESCRIPTION_WORD_WRAP
     });
-    
+
     PreferencesManager.definePreference(INDENT_LINE_COMMENT,  "boolean", false, {
         description: Strings.DESCRIPTION_INDENT_LINE_COMMENT
     });
-    
-    
+
     var editorOptions = Object.keys(cmOptions);
 
     /** Editor preferences */
@@ -250,6 +259,7 @@ define(function (require, exports, module) {
     function _checkTopBoundary(options) {
         return (options !== BOUNDARY_IGNORE_TOP);
     }
+
     function _checkBottomBoundary(options) {
         return true;
     }
@@ -339,7 +349,7 @@ define(function (require, exports, module) {
 
         // To track which pane the editor is being attached to if it's a full editor
         this._paneId = null;
-        
+
         // To track the parent editor ( host editor at that time of creation) of an inline editor
         this._hostEditor = null;
 
@@ -421,6 +431,8 @@ define(function (require, exports, module) {
 
         this._installEditorListeners();
 
+        this._renderGutters();
+
         this.on("cursorActivity", function (event, editor) {
             self._handleCursorActivity(event);
         });
@@ -2334,6 +2346,11 @@ define(function (require, exports, module) {
             } else if (prefName === SHOW_LINE_NUMBERS) {
                 Editor._toggleLinePadding(!newValue);
                 this._codeMirror.setOption(cmOptions[SHOW_LINE_NUMBERS], newValue);
+                if (newValue) {
+                    Editor.registerGutter(LINE_NUMBER_GUTTER, LINE_NUMBER_GUTTER_PRIORITY);
+                } else {
+                    Editor.unregisterGutter(LINE_NUMBER_GUTTER);
+                }
                 this.refreshAll();
             } else {
                 this._codeMirror.setOption(cmOptions[prefName], newValue);
@@ -2389,6 +2406,129 @@ define(function (require, exports, module) {
         }
     };
 
+    /**
+     * Clears all marks from the gutter with the specified name.
+     * @param {string} name The name of the gutter to clear.
+     */
+    Editor.prototype.clearGutter = function (name) {
+        this._codeMirror.clearGutter(name);
+    };
+
+    /**
+     * Renders all registered gutters
+     * @private
+     */
+    Editor.prototype._renderGutters = function () {
+        var languageId = this.document.getLanguage().getId();
+
+        function _filterByLanguages(gutter) {
+            return !gutter.languages || gutter.languages.indexOf(languageId) > -1;
+        }
+
+        function _sortByPriority(a, b) {
+            return a.priority - b.priority;
+        }
+
+        function _getName(gutter) {
+            return gutter.name;
+        }
+
+        var gutters = registeredGutters.map(_getName),
+            rootElement = this.getRootElement();
+
+        // If the line numbers gutter has not been explicitly registered and the CodeMirror lineNumbes option is
+        // set to true, we explicitly add the line numbers gutter. This case occurs the first time the editor loads
+        // and showLineNumbers is set to true in preferences
+        if (gutters.indexOf(LINE_NUMBER_GUTTER) < 0 && this._codeMirror.getOption(cmOptions[SHOW_LINE_NUMBERS])) {
+            registeredGutters.push({name: LINE_NUMBER_GUTTER, priority: LINE_NUMBER_GUTTER_PRIORITY});
+        }
+
+        gutters = registeredGutters.sort(_sortByPriority)
+            .filter(_filterByLanguages)
+            .map(_getName);
+
+        this._codeMirror.setOption("gutters", gutters);
+        this._codeMirror.refresh();
+
+        if (gutters.indexOf(LINE_NUMBER_GUTTER) < 0) {
+            $(rootElement).addClass("linenumber-disabled");
+        } else {
+            $(rootElement).removeClass("linenumber-disabled");
+        }
+    };
+
+    /**
+     * Sets the marker for the specified gutter on the specified line number
+     * @param   {string}   lineNumber The line number for the inserted gutter marker
+     * @param   {string}   gutterName The name of the gutter
+     * @param   {object}   marker     The dom element representing the marker to the inserted in the gutter
+     */
+    Editor.prototype.setGutterMarker = function (lineNumber, gutterName, marker) {
+        var gutterNameRegistered = registeredGutters.some(function (gutter) {
+            return gutter.name === gutterName;
+        });
+
+        if (!gutterNameRegistered) {
+            console.warn("Gutter name must be registered before calling editor.setGutterMarker");
+            return;
+        }
+
+        this._codeMirror.setGutterMarker(lineNumber, gutterName, marker);
+    };
+
+    /**
+     * Returns the list of gutters current registered on all editors.
+     * @return {!Array.<{name: string, priority: number}>}
+     */
+    Editor.getRegisteredGutters = function () {
+        return registeredGutters;
+    };
+
+    /**
+     * Registers the gutter with the specified name at the given priority.
+     * @param {string} name    The name of the gutter.
+     * @param {number} priority  A number denoting the priority of the gutter. Priorities higher than LINE_NUMBER_GUTTER_PRIORITY appear after the line numbers. Priority less than LINE_NUMBER_GUTTER_PRIORITY appear before.
+     * @param {?Array<string>} languageIds A list of language ids that this gutter is valid for. If no language ids are passed, then the gutter is valid in all languages.
+     */
+    Editor.registerGutter = function (name, priority, languageIds) {
+        if (isNaN(priority)) {
+            console.warn("A non-numeric priority value was passed to registerGutter. The value will default to 0.");
+            priority = 0;
+        }
+
+        if (!name || typeof name !== "string") {
+            console.error("The name of the registered gutter must be a string.");
+            return;
+        }
+
+        var gutter = {name: name, priority: priority, languages: languageIds},
+            gutterExists = registeredGutters.some(function (gutter) {
+                return gutter.name === name;
+            });
+
+        if (!gutterExists) {
+            registeredGutters.push(gutter);
+        }
+
+        Editor.forEveryEditor(function (editor) {
+            editor._renderGutters();
+        });
+    };
+
+    /**
+     * Unregisters the gutter with the specified name and removes it from the UI.
+     * @param {string} name The name of the gutter to be unregistered.
+     */
+    Editor.unregisterGutter = function (name) {
+        var i, gutter;
+        registeredGutters = registeredGutters.filter(function (gutter) {
+            return gutter.name !== name;
+        });
+
+        Editor.forEveryEditor(function (editor) {
+            editor._renderGutters();
+        });
+    };
 
     // Global settings that affect Editor instances that share the same preference locations
 
@@ -2540,7 +2680,7 @@ define(function (require, exports, module) {
 
     /**
      * Sets lineCommentIndent option.
-     * 
+     *
      * @param {boolean} value
      * @param {string=} fullPath Path to file to get preference for
      * @return {boolean} true if value was valid
@@ -2549,7 +2689,7 @@ define(function (require, exports, module) {
         var options = fullPath && {context: fullPath};
         return PreferencesManager.set(INDENT_LINE_COMMENT, value, options);
     };
-    
+
     /**
      * Returns true if word wrap is enabled for the specified or current file
      * @param {string=} fullPath Path to file to get preference for
@@ -2558,7 +2698,7 @@ define(function (require, exports, module) {
     Editor.getIndentLineComment = function (fullPath) {
         return PreferencesManager.get(INDENT_LINE_COMMENT, _buildPreferencesContext(fullPath));
     };
-    
+
     /**
      * Runs callback for every Editor instance that currently exists
      * @param {!function(!Editor)} callback
@@ -2588,7 +2728,10 @@ define(function (require, exports, module) {
             $holder.toggleClass("show-line-padding", Boolean(showLinePadding));
         });
     };
-
+    
+    Editor.LINE_NUMBER_GUTTER_PRIORITY = LINE_NUMBER_GUTTER_PRIORITY;
+    Editor.CODE_FOLDING_GUTTER_PRIORITY = CODE_FOLDING_GUTTER_PRIORITY;
+    
     // Set up listeners for preference changes
     editorOptions.forEach(function (prefName) {
         PreferencesManager.on("change", prefName, function () {
 
@@ -35,7 +35,7 @@ define(function (require, exports, module) {
                 lastMark,
                 foldMarks;
             for (i = 0; i < marks.length; ++i) {
-                if (marks[i].__isFold) {
+                if (marks[i].__isFold && force !== "fold") {
                     if (!allowFolded) {
                         return null;
                     }
 
@@ -99,7 +99,7 @@ define(function (require, exports, module) {
                 i = sr.to.line + 1;
             } else {
                 range = cm._lineFolds[i] || (func && func(cm, pos));
-             
+
                 if (!fade || (fade && $gutter.is(":hover"))) {
                     if (cm.isFolded(i)) {
                         // expand fold if invalid
@@ -140,22 +140,6 @@ define(function (require, exports, module) {
         state.to = to;
     }
 
-    /**
-      * Clears the code folding gutter
-      * @param {!CodeMirror} cm the CodeMirror instance for the active  editor
-      */
-    function clearGutter(cm) {
-        var opts = cm.state.foldGutter.options;
-        cm.clearGutter(opts.gutter);
-        var blank = marker("CodeMirror-foldgutter-blank");
-        var vp = cm.getViewport();
-        cm.operation(function () {
-            cm.eachLine(vp.from, vp.to, function (line) {
-                cm.setGutterMarker(line.lineNo(), opts.gutter, blank);
-            });
-        });
-    }
-
     /**
      * Helper function to return the fold text marker on a line in an editor
      * @param   {CodeMirror} cm   The CodeMirror instance for the active editor
@@ -407,7 +391,6 @@ define(function (require, exports, module) {
     }
 
     exports.init = init;
-    exports.clearGutter = clearGutter;
     exports.updateInViewport = updateInViewport;
 
 });
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ define(function (require, exports, module) {`
`35`	`35`	`lastMark,`
`36`	`36`	`foldMarks;`
`37`	`37`	`for (i = 0; i < marks.length; ++i) {`
`38`		`- if (marks[i].__isFold) {`
	`38`	`+ if (marks[i].__isFold && force !== "fold") {`
`39`	`39`	`if (!allowFolded) {`
`40`	`40`	`return null;`
`41`	`41`	`}`