From 9a4a387de65d035a49f1398befc3c8541d1c02c3 Mon Sep 17 00:00:00 2001
From: Adam Jimenez <adam.jimenez@gmail.com>
Date: Fri, 6 Jun 2014 10:32:18 +0100
Subject: [PATCH 1/4] Jump To Matching Tag

Alt-P: Jump to Matching Tag
Alt-Shift-P: Select to Matching Tag
fixes #1158
---
 lib/ace/commands/default_commands.js | 12 ++++
 lib/ace/editor.js                    | 95 ++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index 77cdfc61..e7cb56ad 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -402,6 +402,18 @@ exports.commands = [{
     exec: function(editor) { editor.jumpToMatching(true); },
     multiSelectAction: "forEach",
     readOnly: true
+}, {
+    name: "jumptomatchingtag",
+    bindKey: bindKey("Alt-P", "Alt-Shift-P"),
+    exec: function(editor) { editor.jumpToMatchingTag(); },
+    multiSelectAction: "forEach",
+    readOnly: true
+}, {
+    name: "selecttomatchingtag",
+    bindKey: bindKey("Alt-Shift-P", null),
+    exec: function(editor) { editor.jumpToMatchingTag(true); },
+    multiSelectAction: "forEach",
+    readOnly: true
 }, 
 
 // commands disabled in readOnly mode
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index ef2d9f1a..da77e185 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -48,6 +48,7 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var CommandManager = require("./commands/command_manager").CommandManager;
 var defaultCommands = require("./commands/default_commands").commands;
 var config = require("./config");
+var TokenIterator = require("./token_iterator").TokenIterator;
 
 /**
  * The main entry point into the Ace functionality.
@@ -1948,6 +1949,100 @@ var Editor = function(renderer, session) {
         }
     };
 
+    /**
+     * Moves the cursor's row and column to the next matching tag.
+     *
+     **/
+    this.jumpToMatchingTag = function(select) {
+        var tag;
+        var depth = {};
+        var sel = {};
+        var cursor = this.getCursorPosition();
+        var iterator = new TokenIterator(this.session, cursor.row, cursor.column);
+        var prevToken = iterator.getCurrentToken();
+        var token = iterator.stepForward();
+
+        //get next closing tag
+        if (!token || token.type.indexOf('tag-name') === -1) {
+            do {
+                prevToken = token;
+                token = iterator.stepForward();
+                
+                if(token && token.type.indexOf('tag-name') !== -1) {
+                    if (isNaN(depth[token.value])) {
+                        depth[token.value] = 0;
+                    }
+                    
+                    if (prevToken.value==='<' ){
+                        depth[token.value]++;
+                    } else if ( prevToken.value==='</') {
+                        depth[token.value]--;
+                    }
+                }
+            } while (token && (isNaN(depth[token.value]) || depth[token.value]>=0));
+    	}
+
+		if (token && token.type.indexOf('tag-name') !== -1) {
+			sel.end = {
+				column: iterator.getCurrentTokenColumn()-2,
+				row: iterator.getCurrentTokenRow() 
+			};
+			tag = token.value;
+		}
+		
+		//no tag found
+		if (!tag) {
+			return;
+		}
+
+		//find matching tag
+		do {
+	        token = prevToken;
+            prevToken = iterator.stepBackward();
+            
+            if( prevToken ){
+                if (prevToken.type.indexOf('tag-close') !== -1) {
+                    sel.start = {
+                        column: iterator.getCurrentTokenColumn()+1,
+                        row: iterator.getCurrentTokenRow() 
+                    };
+                }
+    
+                if (token.value===tag && token.type.indexOf('tag-name') !== -1 && prevToken.value==='<') {
+                    depth[tag]++;
+                } else if ( token.value===tag && token.type.indexOf('tag-name') !== -1 && prevToken.value==='</') {
+                    depth[tag]--;
+                }
+            }
+        } while (prevToken && (token.type.indexOf('tag-name') === -1 || depth[tag] !== 0));
+
+        //we found it
+        if (token && token.type.indexOf('tag-name')) {
+            var range = new Range(
+                sel.start.row, 
+                sel.start.column, 
+                sel.end.row, 
+                sel.end.column
+            );
+            
+            var pos = range.start;
+            if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
+                pos = range.end;
+            
+            pos = range && range.cursor || pos;
+            if (pos) {
+                if (select) {
+                    if (range && range.isEqual(this.getSelectionRange()))
+                        this.clearSelection();
+                    else
+                        this.selection.selectTo(pos.row, pos.column);
+                } else {
+                    this.selection.moveTo(pos.row, pos.column);
+                }
+            }
+        }
+    };
+
     /**
      * Moves the cursor to the specified line number, and also into the indiciated column.
      * @param {Number} lineNumber The line number to go to

From 76adcc51a0db435d03bd16c013e4a201d52925d2 Mon Sep 17 00:00:00 2001
From: Adam Jimenez <adam.jimenez@gmail.com>
Date: Mon, 9 Jun 2014 14:12:10 +0100
Subject: [PATCH 2/4] Revert "Jump To Matching Tag"

This reverts commit 9a4a387de65d035a49f1398befc3c8541d1c02c3.
---
 lib/ace/commands/default_commands.js | 12 ----
 lib/ace/editor.js                    | 95 ----------------------------
 2 files changed, 107 deletions(-)

diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index e7cb56ad..77cdfc61 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -402,18 +402,6 @@ exports.commands = [{
     exec: function(editor) { editor.jumpToMatching(true); },
     multiSelectAction: "forEach",
     readOnly: true
-}, {
-    name: "jumptomatchingtag",
-    bindKey: bindKey("Alt-P", "Alt-Shift-P"),
-    exec: function(editor) { editor.jumpToMatchingTag(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttomatchingtag",
-    bindKey: bindKey("Alt-Shift-P", null),
-    exec: function(editor) { editor.jumpToMatchingTag(true); },
-    multiSelectAction: "forEach",
-    readOnly: true
 }, 
 
 // commands disabled in readOnly mode
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index da77e185..ef2d9f1a 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -48,7 +48,6 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var CommandManager = require("./commands/command_manager").CommandManager;
 var defaultCommands = require("./commands/default_commands").commands;
 var config = require("./config");
-var TokenIterator = require("./token_iterator").TokenIterator;
 
 /**
  * The main entry point into the Ace functionality.
@@ -1949,100 +1948,6 @@ var Editor = function(renderer, session) {
         }
     };
 
-    /**
-     * Moves the cursor's row and column to the next matching tag.
-     *
-     **/
-    this.jumpToMatchingTag = function(select) {
-        var tag;
-        var depth = {};
-        var sel = {};
-        var cursor = this.getCursorPosition();
-        var iterator = new TokenIterator(this.session, cursor.row, cursor.column);
-        var prevToken = iterator.getCurrentToken();
-        var token = iterator.stepForward();
-
-        //get next closing tag
-        if (!token || token.type.indexOf('tag-name') === -1) {
-            do {
-                prevToken = token;
-                token = iterator.stepForward();
-                
-                if(token && token.type.indexOf('tag-name') !== -1) {
-                    if (isNaN(depth[token.value])) {
-                        depth[token.value] = 0;
-                    }
-                    
-                    if (prevToken.value==='<' ){
-                        depth[token.value]++;
-                    } else if ( prevToken.value==='</') {
-                        depth[token.value]--;
-                    }
-                }
-            } while (token && (isNaN(depth[token.value]) || depth[token.value]>=0));
-    	}
-
-		if (token && token.type.indexOf('tag-name') !== -1) {
-			sel.end = {
-				column: iterator.getCurrentTokenColumn()-2,
-				row: iterator.getCurrentTokenRow() 
-			};
-			tag = token.value;
-		}
-		
-		//no tag found
-		if (!tag) {
-			return;
-		}
-
-		//find matching tag
-		do {
-	        token = prevToken;
-            prevToken = iterator.stepBackward();
-            
-            if( prevToken ){
-                if (prevToken.type.indexOf('tag-close') !== -1) {
-                    sel.start = {
-                        column: iterator.getCurrentTokenColumn()+1,
-                        row: iterator.getCurrentTokenRow() 
-                    };
-                }
-    
-                if (token.value===tag && token.type.indexOf('tag-name') !== -1 && prevToken.value==='<') {
-                    depth[tag]++;
-                } else if ( token.value===tag && token.type.indexOf('tag-name') !== -1 && prevToken.value==='</') {
-                    depth[tag]--;
-                }
-            }
-        } while (prevToken && (token.type.indexOf('tag-name') === -1 || depth[tag] !== 0));
-
-        //we found it
-        if (token && token.type.indexOf('tag-name')) {
-            var range = new Range(
-                sel.start.row, 
-                sel.start.column, 
-                sel.end.row, 
-                sel.end.column
-            );
-            
-            var pos = range.start;
-            if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
-                pos = range.end;
-            
-            pos = range && range.cursor || pos;
-            if (pos) {
-                if (select) {
-                    if (range && range.isEqual(this.getSelectionRange()))
-                        this.clearSelection();
-                    else
-                        this.selection.selectTo(pos.row, pos.column);
-                } else {
-                    this.selection.moveTo(pos.row, pos.column);
-                }
-            }
-        }
-    };
-
     /**
      * Moves the cursor to the specified line number, and also into the indiciated column.
      * @param {Number} lineNumber The line number to go to

From d7c7cb1b4da143632017788267f7e61ee42107e8 Mon Sep 17 00:00:00 2001
From: Adam Jimenez <adam.jimenez@gmail.com>
Date: Mon, 9 Jun 2014 17:09:31 +0100
Subject: [PATCH 3/4] add html tag support to jumpToMatching

---
 lib/ace/editor.js | 153 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 140 insertions(+), 13 deletions(-)

diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index ef2d9f1a..f57bdc70 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -48,6 +48,7 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var CommandManager = require("./commands/command_manager").CommandManager;
 var defaultCommands = require("./commands/default_commands").commands;
 var config = require("./config");
+var TokenIterator = require("./token_iterator").TokenIterator;
 
 /**
  * The main entry point into the Ace functionality.
@@ -1915,26 +1916,152 @@ var Editor = function(renderer, session) {
     };
 
     /**
-     * Moves the cursor's row and column to the next matching bracket.
+     * Moves the cursor's row and column to the next matching bracket or HTML tag.
      *
      **/
     this.jumpToMatching = function(select) {
         var cursor = this.getCursorPosition();
+        var iterator = new TokenIterator(this.session, cursor.row, cursor.column);
+        var prevToken = iterator.getCurrentToken();
+        var token;
 
-        var range = this.session.getBracketRange(cursor);
-        if (!range) {
-            range = this.find({
-                needle: /[{}()\[\]]/g,
-                preventScroll:true,
-                start: {row: cursor.row, column: cursor.column - 1}
-            });
-            if (!range)
-                return;
-            var pos = range.start;
-            if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
-                range = this.session.getBracketRange(pos);
+        //handle bracket as first char on line
+        if (prevToken && prevToken.index===0)
+            token = prevToken;
+        else
+            token = iterator.stepForward();
+
+        if (!token)
+            return;
+            
+        //get next closing tag or bracket
+        var matchType;
+        var found = false;
+        var inverse;
+        var depth = {};
+        
+        do {
+            if (token.value.match(/[{}()\[\]]/g)) {
+                for (var i=0; i<token.value.length; i++) {
+                    switch (token.value[i]) {
+                        case '(':
+                        case '[':
+                        case '{':
+                            if (isNaN(depth[token.value[i]])) {
+                                depth[token.value] = 0;
+                            }
+                            
+                            depth[token.value[i]]++;
+                        break;
+                        case ')':
+                        case ']':
+                        case '}':
+                            inverse = this.session.$brackets[token.value[i]];
+                            
+                            if (isNaN(depth[inverse])) {
+                                depth[inverse] = 0;
+                            }
+                            
+                            depth[inverse]--;
+                            
+                            if (depth[inverse]===-1) {
+                                matchType = 'bracket';
+                                found = true;
+                            }
+                        break;
+                    }
+                }
+            } else if (token && token.type.indexOf('tag-name') !== -1) {
+                if (isNaN(depth[token.value])) {
+                    depth[token.value] = 0;
+                }
+                
+                if (prevToken.value==='<') {
+                    depth[token.value]++;
+                } else if ( prevToken.value==='</') {
+                    depth[token.value]--;
+                }
+                
+                if (depth[token.value]===-1) {
+                    matchType = 'tag';
+                    found = true;
+                }
+            }
+            
+            if (found===false) {
+                prevToken = token;
+                token = iterator.stepForward();
+            }
+        } while (token && found===false);
+
+        //no match found
+        if (!matchType) {
+            return;
         }
 
+        var range;
+        if (matchType==='bracket') {
+            range = this.session.getBracketRange(cursor);
+            if (!range) {
+                range = new Range(
+                    iterator.getCurrentTokenRow(), 
+                    iterator.getCurrentTokenColumn(), 
+                    iterator.getCurrentTokenRow(), 
+                    iterator.getCurrentTokenColumn()
+                );
+                if (!range)
+                    return;
+                var pos = range.start;
+                if (pos.row === cursor.row && Math.abs(pos.column - cursor.column) < 2)
+                    range = this.session.getBracketRange(pos);
+            }
+        } else if(matchType==='tag') {
+            if (token && token.type.indexOf('tag-name') !== -1)
+                var tag = token.value;
+            else
+                return;
+            
+            var range = new Range(
+                iterator.getCurrentTokenRow(), 
+                iterator.getCurrentTokenColumn()-2, 
+                iterator.getCurrentTokenRow(), 
+                iterator.getCurrentTokenColumn()-2
+            );
+            
+            //find matching tag
+            if (range.compare(cursor.row, cursor.column)===0) {
+                found = false;
+                do {
+                    token = prevToken;
+                    prevToken = iterator.stepBackward();
+                    
+                    if (prevToken) {
+                        if (prevToken.type.indexOf('tag-close') !== -1) {
+                            range.setEnd(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn()+1);
+                        }
+            
+                        if (token.value===tag && token.type.indexOf('tag-name') !== -1) {
+                            if (prevToken.value==='<') {
+                                depth[tag]++;
+                            } else if ( prevToken.value==='</') {
+                                depth[tag]--;
+                            }
+                            
+                            if (depth[tag]===0)
+                                found = true;
+                        }
+                    }
+                } while (prevToken && found===false);
+            }
+    
+            //we found it
+            if (token && token.type.indexOf('tag-name')) {                
+                var pos = range.start;
+                if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
+                    pos = range.end;
+            }
+        }
+                
         pos = range && range.cursor || pos;
         if (pos) {
             if (select) {

From e92b709eb247344e4133bc143bfbdef9dbc6d7cd Mon Sep 17 00:00:00 2001
From: Adam Jimenez <adam.jimenez@gmail.com>
Date: Mon, 9 Jun 2014 21:30:19 +0100
Subject: [PATCH 4/4] fix jumping to brackets in strings

---
 lib/ace/editor.js | 87 +++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index f57bdc70..a60e542f 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -1923,48 +1923,54 @@ var Editor = function(renderer, session) {
         var cursor = this.getCursorPosition();
         var iterator = new TokenIterator(this.session, cursor.row, cursor.column);
         var prevToken = iterator.getCurrentToken();
-        var token;
+        var token = prevToken;
 
-        //handle bracket as first char on line
-        if (prevToken && prevToken.index===0)
-            token = prevToken;
-        else
+        if (!token)
             token = iterator.stepForward();
 
         if (!token)
             return;
-            
+
         //get next closing tag or bracket
         var matchType;
         var found = false;
-        var inverse;
         var depth = {};
+        var i = cursor.column - token.start;
+        var bracketType;
+        var brackets = {
+            ")": "(",
+            "(": "(",
+            "]": "[",
+            "[": "[",
+            "{": "{",
+            "}": "{"
+        };
         
         do {
             if (token.value.match(/[{}()\[\]]/g)) {
-                for (var i=0; i<token.value.length; i++) {
+                for (; i<token.value.length && !found; i++) {
+                    if (!brackets[token.value[i]]) {
+                        continue;
+                    }
+
+                    bracketType = brackets[token.value[i]]+'.'+token.type.replace("rparen", "lparen");
+
+                    if (isNaN(depth[bracketType])) {
+                        depth[bracketType] = 0;
+                    }
+
                     switch (token.value[i]) {
                         case '(':
                         case '[':
                         case '{':
-                            if (isNaN(depth[token.value[i]])) {
-                                depth[token.value] = 0;
-                            }
-                            
-                            depth[token.value[i]]++;
+                            depth[bracketType]++;
                         break;
                         case ')':
                         case ']':
                         case '}':
-                            inverse = this.session.$brackets[token.value[i]];
+                            depth[bracketType]--;
                             
-                            if (isNaN(depth[inverse])) {
-                                depth[inverse] = 0;
-                            }
-                            
-                            depth[inverse]--;
-                            
-                            if (depth[inverse]===-1) {
+                            if (depth[bracketType]===-1) {
                                 matchType = 'bracket';
                                 found = true;
                             }
@@ -1976,23 +1982,24 @@ var Editor = function(renderer, session) {
                     depth[token.value] = 0;
                 }
                 
-                if (prevToken.value==='<') {
+                if (prevToken.value === '<') {
                     depth[token.value]++;
-                } else if ( prevToken.value==='</') {
+                } else if (prevToken.value === '</') {
                     depth[token.value]--;
                 }
                 
-                if (depth[token.value]===-1) {
+                if (depth[token.value] === -1) {
                     matchType = 'tag';
                     found = true;
                 }
             }
-            
-            if (found===false) {
+
+            if (!found) {
                 prevToken = token;
                 token = iterator.stepForward();
+                i = 0;
             }
-        } while (token && found===false);
+        } while (token && !found);
 
         //no match found
         if (!matchType) {
@@ -2005,9 +2012,9 @@ var Editor = function(renderer, session) {
             if (!range) {
                 range = new Range(
                     iterator.getCurrentTokenRow(), 
-                    iterator.getCurrentTokenColumn(), 
+                    iterator.getCurrentTokenColumn()+i-1,
                     iterator.getCurrentTokenRow(), 
-                    iterator.getCurrentTokenColumn()
+                    iterator.getCurrentTokenColumn()+i-1
                 );
                 if (!range)
                     return;
@@ -2020,16 +2027,16 @@ var Editor = function(renderer, session) {
                 var tag = token.value;
             else
                 return;
-            
+
             var range = new Range(
                 iterator.getCurrentTokenRow(), 
                 iterator.getCurrentTokenColumn()-2, 
                 iterator.getCurrentTokenRow(), 
                 iterator.getCurrentTokenColumn()-2
             );
-            
+
             //find matching tag
-            if (range.compare(cursor.row, cursor.column)===0) {
+            if (range.compare(cursor.row, cursor.column) === 0) {
                 found = false;
                 do {
                     token = prevToken;
@@ -2039,11 +2046,11 @@ var Editor = function(renderer, session) {
                         if (prevToken.type.indexOf('tag-close') !== -1) {
                             range.setEnd(iterator.getCurrentTokenRow(), iterator.getCurrentTokenColumn()+1);
                         }
-            
-                        if (token.value===tag && token.type.indexOf('tag-name') !== -1) {
-                            if (prevToken.value==='<') {
+
+                        if (token.value === tag && token.type.indexOf('tag-name') !== -1) {
+                            if (prevToken.value === '<') {
                                 depth[tag]++;
-                            } else if ( prevToken.value==='</') {
+                            } else if ( prevToken.value === '</') {
                                 depth[tag]--;
                             }
                             
@@ -2051,17 +2058,17 @@ var Editor = function(renderer, session) {
                                 found = true;
                         }
                     }
-                } while (prevToken && found===false);
+                } while (prevToken && !found);
             }
-    
+
             //we found it
-            if (token && token.type.indexOf('tag-name')) {                
+            if (token && token.type.indexOf('tag-name')) {
                 var pos = range.start;
                 if (pos.row == cursor.row && Math.abs(pos.column - cursor.column) < 2)
                     pos = range.end;
             }
         }
-                
+
         pos = range && range.cursor || pos;
         if (pos) {
             if (select) {