Minor fixes after review

WebsiteDeveloper · WebsiteDeveloper · commit 53cbe28bca55 · 2013-04-20T07:14:52.000+02:00
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
@@ -400,12 +400,12 @@ define(function (require, exports, module) {
                 return createTagInfo();
             }
             
-            // Check to see if this is the closing of a tag (either the start or end) self closing tag
+            // Check to see if this is the closing of a start tag or a self closing tag
             if (ctx.token.string === ">" || ctx.token.string === "/>") {
                 return createTagInfo();
             }
             
-            // Check to see if this is the closing of a tag (either the start or end) closing tag
+            // Check to see if this is a closing tag
             if (ctx.token.string.charAt(0) === "<" && ctx.token.string.charAt(1) === "/") {
                 return createTagInfo(CLOSING_TAG, offset - 2, ctx.token.string.slice(2));
             }
diff --git a/test/spec/CodeHintUtils-test.js b/test/spec/CodeHintUtils-test.js
@@ -186,16 +186,6 @@ define(function (require, exports, module) {
                 expect(tag).toEqual(HTMLUtils.createTagInfo(HTMLUtils.TAG_NAME));
             });
             
-            it("should not hint anything inside a closing tag", function () {
-                var pos = {"ch": 0, "line": 0};
-                setContentAndUpdatePos(pos,
-                    ["<html>", "<body>", "<div id='test' class='foo'></div>"],
-                    "</body></ht", "ml>");
-                
-                var tag = HTMLUtils.getTagInfo(myEditor, pos);
-                expect(tag).toEqual(HTMLUtils.createTagInfo(HTMLUtils.CLOSING_TAG, 2, "html"));
-            });
-            
             it("should find the tagname of the current tag if two tags are right next to each other", function () {
                 var pos = {"ch": 0, "line": 0};
                 setContentAndUpdatePos(pos,
@@ -247,6 +237,16 @@ define(function (require, exports, module) {
                 expect(tag).toEqual(HTMLUtils.createTagInfo());
             });
             
+            it("should not hint anything inside a closing tag", function () {
+                var pos = {"ch": 0, "line": 0};
+                setContentAndUpdatePos(pos,
+                    ["<html>", "<body>", "<div id='test' class='foo'></div>"],
+                    "</body></ht", "ml>");
+                
+                var tag = HTMLUtils.getTagInfo(myEditor, pos);
+                expect(tag).toEqual(HTMLUtils.createTagInfo(HTMLUtils.CLOSING_TAG, 2, "html"));
+            });
+            
             it("should not find attributes in an empty editor", function () {
                 var pos = {"ch": 0, "line": 0};
                 var attrs = HTMLUtils.getTagAttributes(myEditor, pos);

Original file line number	Diff line number	Diff line change
`@@ -400,12 +400,12 @@ define(function (require, exports, module) {`
`400`	`400`	`return createTagInfo();`
`401`	`401`	`}`
`402`	`402`
`403`		`- // Check to see if this is the closing of a tag (either the start or end) self closing tag`
	`403`	`+ // Check to see if this is the closing of a start tag or a self closing tag`
`404`	`404`	`if (ctx.token.string === ">" \|\| ctx.token.string === "/>") {`
`405`	`405`	`return createTagInfo();`
`406`	`406`	`}`
`407`	`407`
`408`		`- // Check to see if this is the closing of a tag (either the start or end) closing tag`
	`408`	`+ // Check to see if this is a closing tag`
`409`	`409`	`if (ctx.token.string.charAt(0) === "<" && ctx.token.string.charAt(1) === "/") {`
`410`	`410`	`return createTagInfo(CLOSING_TAG, offset - 2, ctx.token.string.slice(2));`
`411`	`411`	`}`