Merge pull request #2465 from jbalsas/fix-2464

RaymondLim · RaymondLim · commit b9873b3b6762 · 2013-01-04T07:43:00.000-08:00
Test and fix for #2464
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
@@ -133,6 +133,11 @@ define(function (require, exports, module) {
                 
                 while (TokenUtils.moveNextToken(forwardCtx) && forwardCtx.token.className !== "tag") {
                     if (forwardCtx.token.className === "attribute") {
+                        // If the current tag is not closed, codemirror may return the next opening
+                        // tag as an attribute. Stop the search loop in that case.
+                        if (forwardCtx.token.string.indexOf("<") === 0) {
+                            break;
+                        }
                         attrs.push(forwardCtx.token.string);
                     } else if (forwardCtx.token.className === "error") {
                         // If we type the first letter of the next attribute, it comes as an error
diff --git a/test/spec/CodeHintUtils-test.js b/test/spec/CodeHintUtils-test.js
@@ -332,6 +332,16 @@ define(function (require, exports, module) {
                 var attrs = HTMLUtils.getTagAttributes(myEditor, pos);
                 expect(attrs.sort()).toEqual(["id", "class", "lang", "align", "title"].sort());
             });
+            
+            it("should not find attributes of other tags on an opened tag", function () {
+                var pos = {"ch": 0, "line": 0};
+                setContentAndUpdatePos(pos,
+                    ["<html>", "<body>"],
+                    "<div ", "",
+                    ["<div id='foo' class='clazz'>", "</div>", "</body>", "</html>"]);
+                var attrs = HTMLUtils.getTagAttributes(myEditor, pos);
+                expect(attrs).toEqual([]);
+            });
         });
     });
 });
