Fixes after second review

WebsiteDeveloper · WebsiteDeveloper · commit f50e37612053 · 2013-04-16T19:17:52.000+02:00
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
@@ -407,7 +407,7 @@ define(function (require, exports, module) {
             
             // Check to see if this is the closing of a tag (either the start or end) closing tag
             if (ctx.token.string.charAt(0) === "<" && ctx.token.string.charAt(1) === "/") {
-                return createTagInfo(CLOSING_TAG, offset + 2, ctx.token.string.slice(2));
+                return createTagInfo(CLOSING_TAG, offset - 2, ctx.token.string.slice(2));
             }
             
             // Make sure the cursor is not after an equal sign or a quote before we report the context as a tag.
diff --git a/test/spec/CodeHintUtils-test.js b/test/spec/CodeHintUtils-test.js
@@ -186,14 +186,14 @@ define(function (require, exports, module) {
                 expect(tag).toEqual(HTMLUtils.createTagInfo(HTMLUtils.TAG_NAME));
             });
             
-            it("should hint tagname for a closing tag", function () {
+            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, 6, "html"));
+                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 () {
diff --git a/test/spec/InlineEditorProviders-test-files/test1.html b/test/spec/InlineEditorProviders-test-files/test1.html
@@ -8,6 +8,6 @@
     <div{{0}} class="{{1}}foo" id="myDiv{{2}}">{{3}}</div>
     <!--<div{{4}}>-->
     <div id="anotherDiv{{6}}"></div>
-    <div{{8}} {{7}}class="foo"></div>
+    <div{{8}} {{7}}class="foo"></{{9}}div>
 </body>
 </html>
diff --git a/test/spec/InlineEditorProviders-test.js b/test/spec/InlineEditorProviders-test.js
@@ -252,7 +252,7 @@ define(function (require, exports, module) {
             });
 
 
-            it("should open a type selector", function () {
+            it("should open a type selector on opening tag", function () {
                 initInlineTest("test1.html", 0);
                 
                 runs(function () {
@@ -263,6 +263,18 @@ define(function (require, exports, module) {
                     expect(inlinePos).toEqual(this.infos["test1.css"].offsets[0]);
                 });
             });
+            
+            it("should open a type selector on closing tag", function () {
+                initInlineTest("test1.html", 9);
+                
+                runs(function () {
+                    var inlineWidget = EditorManager.getCurrentFullEditor().getInlineWidgets()[0];
+                    var inlinePos = inlineWidget.editors[0].getCursorPos();
+                    
+                    // verify cursor position in inline editor
+                    expect(inlinePos).toEqual(this.infos["test1.css"].offsets[0]);
+                });
+            });
 
             it("should open a class selector", function () {
                 initInlineTest("test1.html", 1);

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ define(function (require, exports, module) {`
`407`	`407`
`408`	`408`	`// Check to see if this is the closing of a tag (either the start or end) closing tag`
`409`	`409`	`if (ctx.token.string.charAt(0) === "<" && ctx.token.string.charAt(1) === "/") {`
`410`		`- return createTagInfo(CLOSING_TAG, offset + 2, ctx.token.string.slice(2));`
	`410`	`+ return createTagInfo(CLOSING_TAG, offset - 2, ctx.token.string.slice(2));`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`// Make sure the cursor is not after an equal sign or a quote before we report the context as a tag.`