From 0755c30d589d0e5f94093d32753a511ba29839b5 Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Thu, 25 Apr 2013 10:27:25 -0400
Subject: [PATCH 1/6] Basic support for code hinting in html files.

For HTML files, we replace the HTML sections with whitespace, leaving only the text of the script tags for Tern to see.
This way the offset/cursor positions don't need to be translated, which would be necessary to get jump-to-def to work.
---
 .../JavaScriptCodeHints/ScopeManager.js       | 12 ++-
 .../default/JavaScriptCodeHints/Session.js    | 93 ++++++++++++++++++-
 .../default/JavaScriptCodeHints/main.js       | 23 ++++-
 3 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
index f99fb5b2a0f..1ed86b21ffb 100644
--- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
+++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
@@ -286,7 +286,7 @@ define(function (require, exports, module) {
      * @return {jQuery.Promise} - The promise will not complete until the tern
      *      hints have completed.
      */
-    function requestHints(session, document, offset) {
+    function requestHints(session, document) {
         var path    = document.file.fullPath,
             split   = HintUtils.splitPath(path),
             dir     = split.dir,
@@ -295,12 +295,14 @@ define(function (require, exports, module) {
         var $deferredHints = $.Deferred(),
             hintPromise,
             fnTypePromise,
-            propsPromise;
+            propsPromise,
+            text = session.getJavascriptText(),
+            offset = session.getOffset();
         
-        hintPromise = getTernHints(dir, file, offset, document.getText());
+        hintPromise = getTernHints(dir, file, offset, text);
         var sessionType = session.getType();
         if (sessionType.property) {
-            propsPromise = getTernProperties(dir, file, offset, document.getText());
+            propsPromise = getTernProperties(dir, file, offset, text);
         } else {
             var $propsDeferred = $.Deferred();
             propsPromise = $propsDeferred.promise();
@@ -309,7 +311,7 @@ define(function (require, exports, module) {
 
         if (sessionType.showFunctionType) {
             // Show function sig
-            fnTypePromise = getTernFunctionType(dir, file, sessionType.functionCallPos, offset, document.getText());
+            fnTypePromise = getTernFunctionType(dir, file, sessionType.functionCallPos, offset, text);
         } else {
             var $fnTypeDeferred = $.Deferred();
             fnTypePromise = $fnTypeDeferred.promise();
diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
index 2df37b16d4a..fa2e1f8edbc 100644
--- a/src/extensions/default/JavaScriptCodeHints/Session.js
+++ b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -21,13 +21,16 @@
  * 
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
 /*global define, brackets, $ */
 
 define(function (require, exports, module) {
     "use strict";
 
     var StringMatch     = brackets.getModule("utils/StringMatch"),
+        LanguageManager = brackets.getModule("language/LanguageManager"),
+        HTMLUtils       = brackets.getModule("language/HTMLUtils"),
+        TokenUtils      = brackets.getModule("utils/TokenUtils"),
         HintUtils       = require("HintUtils"),
         ScopeManager    = require("ScopeManager");
 
@@ -251,6 +254,16 @@ define(function (require, exports, module) {
      *      function being called     
      */
     Session.prototype.getType = function () {
+        function getLexicalInfo(token) {
+            if (token.state.lexical) {
+                // in a javascript file this is just in the state field
+                return token.state.lexical.info;
+            } else if (token.state.localState && token.state.localState.lexical) {
+                // inline javascript in an html file will have this in 
+                // the localState field
+                return token.state.localState.lexical.info;
+            }
+        }
         var propertyLookup   = false,
             inFunctionCall   = false,
             showFunctionType = false,
@@ -262,7 +275,7 @@ define(function (require, exports, module) {
         if (token) {
             // if this token is part of a function call, then the tokens lexical info
             // will be annotated with "call"
-            if (token.state.lexical.info === "call") {
+            if (getLexicalInfo(token) === "call") {
                 inFunctionCall = true;
                 if (this.getQuery().length > 0) {
                     inFunctionCall = false;
@@ -451,6 +464,82 @@ define(function (require, exports, module) {
         }
         return hints;
     };
+
+    /**
+     * Get the javascript text of the file open in the editor for this Session.
+     * For a javascript file, this is just the text of the file.  For an HTML file,
+     * this will be only the text in the <script> tags.  This is so that we can pass
+     * just the javascript text to tern, and avoid confusing it with HTML tags, since it
+     * only knows how to parse javascript.
+     * @return {string} - the "javascript" text that can be sent to Tern.
+     */
+    Session.prototype.getJavascriptText = function () {
+        if (LanguageManager.getLanguageForPath(this.editor.document.file.fullPath).getId() === "html") {
+            // HTML file - need to send back only the bodies of the
+            // <script> tags
+            var text = "",
+                offset = this.getOffset(),
+                ctx = TokenUtils.getInitialContext(this.editor._codeMirror, {line: 0, ch: 0 }),
+                tokenModeName,
+                inScriptBlock = false,
+                currentScriptBlock,
+                scriptBlocks = [],
+                cursor = this.getCursor(),
+                editor = this.editor;
+            
+            // Loop over the tokens in the html file, and extract the blocks
+            // that are the javascript code
+            while (TokenUtils.moveNextToken(ctx)) {
+                tokenModeName = TokenUtils.getModeAt(ctx.editor, ctx.pos).name;
+                if (inScriptBlock) {
+                    // Check for end of this <script> block
+                    if (tokenModeName !== "javascript") {
+                        if (!currentScriptBlock.end) {
+                            // Handle empty script blocks
+                            currentScriptBlock.end = currentScriptBlock.start;
+                        }
+                        currentScriptBlock.text = editor.document.getRange(currentScriptBlock.start, currentScriptBlock.end);
+                        inScriptBlock = false;
+                    } else {
+                        currentScriptBlock.end = { line: ctx.pos.line, ch: ctx.pos.ch };
+                    }
+                } else {
+                    // Check for start of a <script> block
+                    if (tokenModeName === "javascript") {
+                        currentScriptBlock = {
+                            start: { line: ctx.pos.line, ch: ctx.pos.ch }
+                        };
+                        scriptBlocks.push(currentScriptBlock);
+                        inScriptBlock = true;
+                    }
+                }
+            }
+            // Add all the javascript text
+            // For non-javascript blocks we replace everything except for newlines
+            // with whitespace.  This is so that the offset and cursor positions
+            // we get from the document still work.  
+            // Alternatively we could strip the non-javascript text, and modify the offset,
+            // and/or cursor, but then we have to remember how to reverse the translation
+            // to support jump-to-definition
+            var htmlStart = {line: 0, ch: 0};
+            scriptBlocks.forEach(function (scriptBlock) {
+                var start = scriptBlock.start,
+                    end = scriptBlock.end;
+                
+                // get the preceding html text, and replace it with whitespace
+                var htmlText = editor.document.getRange(htmlStart, start);
+                htmlText = htmlText.replace(/./g, " ");
+
+                htmlStart = end;
+                text += htmlText + scriptBlock.text;
+            });
+            
+            return text;
+        } else {
+            // Javascript file, just return the text
+            return this.editor.document.getText();
+        }
+    };
     
     module.exports = Session;
 });
diff --git a/src/extensions/default/JavaScriptCodeHints/main.js b/src/extensions/default/JavaScriptCodeHints/main.js
index c47ea0dcfb2..e178be5db4e 100644
--- a/src/extensions/default/JavaScriptCodeHints/main.js
+++ b/src/extensions/default/JavaScriptCodeHints/main.js
@@ -38,6 +38,7 @@ define(function (require, exports, module) {
         ExtensionUtils  = brackets.getModule("utils/ExtensionUtils"),
         StringUtils     = brackets.getModule("utils/StringUtils"),
         StringMatch     = brackets.getModule("utils/StringMatch"),
+        LanguageManager = brackets.getModule("language/LanguageManager"),
         HintUtils       = require("HintUtils"),
         ScopeManager    = require("ScopeManager"),
         Session         = require("Session");
@@ -235,6 +236,18 @@ define(function (require, exports, module) {
         }
     };
 
+    /**
+     * @return {boolean} - true if the document is a html file
+     */
+    function isHTMLFile(document) {
+        var languageID = LanguageManager.getLanguageForPath(document.file.fullPath).getId();
+        return languageID === "html";
+    }
+    
+    function isInlineScript(editor) {
+        return editor.getModeForSelection() === "javascript";
+    }
+
     /**
      * Determine whether hints are available for a given editor context
      * 
@@ -244,6 +257,12 @@ define(function (require, exports, module) {
      */
     JSHints.prototype.hasHints = function (editor, key) {
         if (session && HintUtils.hintableKey(key)) {
+            
+            if (isHTMLFile(session.editor.document)) {
+                if (!isInlineScript(session.editor)) {
+                    return false;
+                }
+            }
             var cursor  = session.getCursor(),
                 token   = session.getToken(cursor);
 
@@ -293,7 +312,7 @@ define(function (require, exports, module) {
             // type has changed since the last hint computation
             if (this.needNewHints(session)) {
                 var offset          = session.getOffset(),
-                    scopeResponse   = ScopeManager.requestHints(session, session.editor.document, offset);
+                    scopeResponse   = ScopeManager.requestHints(session, session.editor.document);
 
                 if (scopeResponse.hasOwnProperty("promise")) {
                     var $deferredHints = $.Deferred();
@@ -497,7 +516,7 @@ define(function (require, exports, module) {
         installEditorListeners(EditorManager.getActiveEditor());
 
         var jsHints = new JSHints();
-        CodeHintManager.registerHintProvider(jsHints, [HintUtils.LANGUAGE_ID], 0);
+        CodeHintManager.registerHintProvider(jsHints, [HintUtils.LANGUAGE_ID, "html"], 0);
 
         // for unit testing
         exports.getSession = getSession;

From 9416e75828f311dd60df833f4574cacfac7fa8cc Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Thu, 2 May 2013 16:25:44 -0400
Subject: [PATCH 2/6] Add tests for jscodehints in an html file.

Also fix some bugs with jump-to-def and function type hints uncovered by the tests.
---
 .../JavaScriptCodeHints/ScopeManager.js       |  2 +-
 .../default/JavaScriptCodeHints/Session.js    | 14 +++--
 .../default/JavaScriptCodeHints/unittests.js  | 63 ++++++++++++++++++-
 3 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
index 1ed86b21ffb..cad70a61da0 100644
--- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
+++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
@@ -152,7 +152,7 @@ define(function (require, exports, module) {
             dir     = split.dir,
             file    = split.file;
         
-        var ternPromise = getJumptoDef(dir, file, offset, document.getText());
+        var ternPromise = getJumptoDef(dir, file, offset, session.getJavascriptText());
         
         return {promise: ternPromise};
     }
diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
index fa2e1f8edbc..2081e085d12 100644
--- a/src/extensions/default/JavaScriptCodeHints/Session.js
+++ b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -254,14 +254,14 @@ define(function (require, exports, module) {
      *      function being called     
      */
     Session.prototype.getType = function () {
-        function getLexicalInfo(token) {
+        function getLexicalState(token) {
             if (token.state.lexical) {
                 // in a javascript file this is just in the state field
-                return token.state.lexical.info;
+                return token.state.lexical;
             } else if (token.state.localState && token.state.localState.lexical) {
                 // inline javascript in an html file will have this in 
                 // the localState field
-                return token.state.localState.lexical.info;
+                return token.state.localState.lexical;
             }
         }
         var propertyLookup   = false,
@@ -270,12 +270,14 @@ define(function (require, exports, module) {
             context          = null,
             cursor           = this.getCursor(),
             functionCallPos,
-            token            = this.getToken(cursor);
+            token            = this.getToken(cursor),
+            lexical;
 
         if (token) {
             // if this token is part of a function call, then the tokens lexical info
             // will be annotated with "call"
-            if (getLexicalInfo(token) === "call") {
+            lexical = getLexicalState(token);
+            if (lexical.info === "call") {
                 inFunctionCall = true;
                 if (this.getQuery().length > 0) {
                     inFunctionCall = false;
@@ -292,7 +294,7 @@ define(function (require, exports, module) {
                     // and it will prevent us from walking back thousands of lines if something went wrong.
                     // there is nothing magical about 9 lines, and it can be adjusted if it doesn't seem to be
                     // working well
-                    var col = token.state.lexical.column,
+                    var col = lexical.column,
                         line,
                         e,
                         found;
diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js
index 6fa0f2fe4a4..f9b7950ace6 100644
--- a/src/extensions/default/JavaScriptCodeHints/unittests.js
+++ b/src/extensions/default/JavaScriptCodeHints/unittests.js
@@ -37,8 +37,11 @@ define(function (require, exports, module) {
 
     var extensionPath   = FileUtils.getNativeModuleDirectoryPath(module),
         testPath        = extensionPath + "/test/file1.js",
+        testHtmlPath    = extensionPath + "/test/index.html",
         testDoc         = null,
-        testEditor;
+        testHtmlDoc     = null,
+        testEditor,
+        testHtmlEditor;
 
     /**
      * Returns an Editor suitable for use in isolation, given a Document. (Unlike
@@ -76,7 +79,7 @@ define(function (require, exports, module) {
             if (key === undefined) {
                 key = null;
             }
-            
+
             expect(provider.hasHints(testEditor, key)).toBe(true);
             return provider.getHints(null);
         }
@@ -317,6 +320,19 @@ define(function (require, exports, module) {
             
         }
         
+        /**
+         * Should be called at the beginning of any tests for hints in an html file.
+         * Start a test int he index.html test file, instead
+         * of the file1.js file.
+         * This switches the document and editor to point to the html file
+         * and re-inits the hinting session with the html editor
+         */
+        function startHtmlTest() {
+            testEditor = testHtmlEditor;
+            testDoc = testHtmlDoc;
+            JSCodeHints.initializeSession(testEditor);
+        }
+        
         describe("JavaScript Code Hinting", function () {
    
             beforeEach(function () {
@@ -324,14 +340,18 @@ define(function (require, exports, module) {
                 DocumentManager.getDocumentForPath(testPath).done(function (doc) {
                     testDoc = doc;
                 });
+                DocumentManager.getDocumentForPath(testHtmlPath).done(function (doc) {
+                    testHtmlDoc = doc;
+                });
                 
                 waitsFor(function () {
-                    return testDoc !== null;
+                    return testDoc !== null && testHtmlDoc !== null;
                 }, "Unable to open test document", 10000);
                 
                 // create Editor instance (containing a CodeMirror instance)
                 runs(function () {
                     testEditor = createMockEditor(testDoc);
+                    testHtmlEditor = createMockEditor(testHtmlDoc);
                     JSCodeHints.initializeSession(testEditor);
                 });
             });
@@ -731,6 +751,43 @@ define(function (require, exports, module) {
                 });
             });
 
+            it("basic codehints in html file", function () {
+                var start = { line: 30, ch: 9 },
+                    end   = { line: 30, ch: 11 };
+                
+                startHtmlTest();
+                
+                testDoc.replaceRange("x.", start, start);
+                testEditor.setCursorPos(end);
+                var hintObj = expectHints(JSCodeHints.jsHintProvider);
+                runs(function () {
+                    hintsPresentOrdered(hintObj, ["charAt", "charCodeAt", "concat", "indexOf"]);
+                });
+            });
+
+            it("function type hint in html file", function () {
+                var start = { line: 29, ch: 12 };
+                
+                startHtmlTest();
+                
+                testEditor.setCursorPos(start);
+                var hintObj = expectHints(JSCodeHints.jsHintProvider);
+                runs(function () {
+                    hintsPresentExact(hintObj, ["foo(a: number) -> string"]);
+                });
+            });
+
+            it("jump-to-def in html file", function () {
+                var start = { line: 29, ch: 10 };
+                
+                startHtmlTest();
+                
+                testEditor.setCursorPos(start);
+                runs(function () {
+                    editorJumped({line: 18, ch: 20});
+                });
+            });
+
         });
 
     });

From 046cb6bb630de4c0b590360feae346277a020c0e Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Fri, 3 May 2013 10:00:06 -0400
Subject: [PATCH 3/6] Forgot to add new test file

---
 .../JavaScriptCodeHints/test/index.html       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/extensions/default/JavaScriptCodeHints/test/index.html

diff --git a/src/extensions/default/JavaScriptCodeHints/test/index.html b/src/extensions/default/JavaScriptCodeHints/test/index.html
new file mode 100644
index 00000000000..a04dc5c7d83
--- /dev/null
+++ b/src/extensions/default/JavaScriptCodeHints/test/index.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Test file for codehints in .html file</title>
+  </head>
+  <body>
+    <script src="file1.js"></script>
+    <script>
+        var x = "hi";
+    </script>
+      some stuff
+
+    <input type="button">
+      
+    <div class="content">
+    </div>
+    <script>
+        function foo(a){
+            return "hi";
+        }
+        
+    </script>      
+      
+    some other stuff
+      <div class = "content">
+      </div>
+
+    <script>
+        foo(10);
+        
+    </script>
+      
+  </body>
+</html>
\ No newline at end of file

From 5d7dc76dfb63722ccbb6163f5916882d3442829c Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Fri, 3 May 2013 11:29:43 -0400
Subject: [PATCH 4/6] refactor HTMLUtils.findStyleBlocks to find arbitrary
 blocks.

The js code hinting code needed to find script blocks, so refactor the style block code to find any kind of block, and call that instead of having another copy of the code.  findStyleBlocks now just calls the generic method, looking for "css" blocks.

Also fixed up the block finding code to handle empty blocks, which I ran into when looking for "javascript" blocks.
---
 .../default/JavaScriptCodeHints/Session.js    | 35 +-----------
 src/language/HTMLUtils.js                     | 57 ++++++++++++-------
 2 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
index 2081e085d12..475425e32f4 100644
--- a/src/extensions/default/JavaScriptCodeHints/Session.js
+++ b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -481,41 +481,10 @@ define(function (require, exports, module) {
             // <script> tags
             var text = "",
                 offset = this.getOffset(),
-                ctx = TokenUtils.getInitialContext(this.editor._codeMirror, {line: 0, ch: 0 }),
-                tokenModeName,
-                inScriptBlock = false,
-                currentScriptBlock,
-                scriptBlocks = [],
                 cursor = this.getCursor(),
-                editor = this.editor;
+                editor = this.editor,
+                scriptBlocks = HTMLUtils.findBlocks(editor, "javascript");
             
-            // Loop over the tokens in the html file, and extract the blocks
-            // that are the javascript code
-            while (TokenUtils.moveNextToken(ctx)) {
-                tokenModeName = TokenUtils.getModeAt(ctx.editor, ctx.pos).name;
-                if (inScriptBlock) {
-                    // Check for end of this <script> block
-                    if (tokenModeName !== "javascript") {
-                        if (!currentScriptBlock.end) {
-                            // Handle empty script blocks
-                            currentScriptBlock.end = currentScriptBlock.start;
-                        }
-                        currentScriptBlock.text = editor.document.getRange(currentScriptBlock.start, currentScriptBlock.end);
-                        inScriptBlock = false;
-                    } else {
-                        currentScriptBlock.end = { line: ctx.pos.line, ch: ctx.pos.ch };
-                    }
-                } else {
-                    // Check for start of a <script> block
-                    if (tokenModeName === "javascript") {
-                        currentScriptBlock = {
-                            start: { line: ctx.pos.line, ch: ctx.pos.ch }
-                        };
-                        scriptBlocks.push(currentScriptBlock);
-                        inScriptBlock = true;
-                    }
-                }
-            }
             // Add all the javascript text
             // For non-javascript blocks we replace everything except for newlines
             // with whitespace.  This is so that the offset and cursor positions
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
index 00b051c1824..6a06b8433a6 100644
--- a/src/language/HTMLUtils.js
+++ b/src/language/HTMLUtils.js
@@ -465,46 +465,62 @@ define(function (require, exports, module) {
     }
     
     
+
     /**
-     * Returns an Array of info about all <style> blocks in the given Editor's HTML document (assumes
-     * the Editor contains HTML text).
-     * @param {!Editor} editor
+     * Returns an Array of info about all blocks whose token mode name matches that passed in,
+     * in the given Editor's HTML document (assumes the Editor contains HTML text).
+     * @param {!Editor} editor - the editor containing the HTML text
+     * @param {string} modeName - the mode name of the tokens to look for
      * @return {Array.<{start:{line:number, ch:number}, end:{line:number, ch:number}, text:string}>}
      */
-    function findStyleBlocks(editor) {
+    function findBlocks(editor, modeName) {
         // Start scanning from beginning of file
         var ctx = TokenUtils.getInitialContext(editor._codeMirror, {line: 0, ch: 0}),
-            styleBlocks = [],
-            currentStyleBlock = null,
-            inStyleBlock = false,
+            blocks = [],
+            currentBlock = null,
+            inBlock = false,
             outerMode = editor._codeMirror.getMode(),
             tokenModeName;
         
         while (TokenUtils.moveNextToken(ctx)) {
             tokenModeName = CodeMirror.innerMode(outerMode, ctx.token.state).mode.name;
-            if (inStyleBlock) {
-                // Check for end of this <style> block
-                if (tokenModeName !== "css") {
+            if (inBlock) {
+                if (!currentBlock.end) {
+                    // Handle empty blocks
+                    currentBlock.end = currentBlock.start;
+                }
+                // Check for end of this block
+                if (tokenModeName !== modeName) {
                     // currentStyleBlock.end is already set to pos of the last CSS token by now
-                    currentStyleBlock.text = editor.document.getRange(currentStyleBlock.start, currentStyleBlock.end);
-                    inStyleBlock = false;
+                    currentBlock.text = editor.document.getRange(currentBlock.start, currentBlock.end);
+                    inBlock = false;
                 } else {
-                    currentStyleBlock.end = { line: ctx.pos.line, ch: ctx.pos.ch };
+                    currentBlock.end = { line: ctx.pos.line, ch: ctx.pos.ch };
                 }
             } else {
-                // Check for start of a <style> block
-                if (tokenModeName === "css") {
-                    currentStyleBlock = {
+                // Check for start of a block
+                if (tokenModeName === modeName) {
+                    currentBlock = {
                         start: { line: ctx.pos.line, ch: ctx.pos.ch }
                     };
-                    styleBlocks.push(currentStyleBlock);
-                    inStyleBlock = true;
+                    blocks.push(currentBlock);
+                    inBlock = true;
                 }
-                // else, random token in non-CSS content: ignore
+                // else, random token: ignore
             }
         }
         
-        return styleBlocks;
+        return blocks;
+    }
+
+    /**
+     * Returns an Array of info about all <style> blocks in the given Editor's HTML document (assumes
+     * the Editor contains HTML text).
+     * @param {!Editor} editor
+     * @return {Array.<{start:{line:number, ch:number}, end:{line:number, ch:number}, text:string}>}
+     */
+    function findStyleBlocks(editor) {
+        return findBlocks(editor, "css");
     }
     
     
@@ -520,4 +536,5 @@ define(function (require, exports, module) {
     //compare results with
     exports.createTagInfo   = createTagInfo;
     exports.findStyleBlocks = findStyleBlocks;
+    exports.findBlocks      = findBlocks;
 });

From 678ae5aed0db6aaee1b107a591132e33462b608a Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Thu, 9 May 2013 14:54:40 -0400
Subject: [PATCH 5/6] Code review cleanup - mostly in the unittests

---
 .../default/JavaScriptCodeHints/main.js       |   3 +-
 .../default/JavaScriptCodeHints/unittests.js  | 121 +++++++++---------
 2 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/src/extensions/default/JavaScriptCodeHints/main.js b/src/extensions/default/JavaScriptCodeHints/main.js
index 50b4e44ff46..ee0364dbc49 100644
--- a/src/extensions/default/JavaScriptCodeHints/main.js
+++ b/src/extensions/default/JavaScriptCodeHints/main.js
@@ -311,8 +311,7 @@ define(function (require, exports, module) {
             // Compute fresh hints if none exist, or if the session
             // type has changed since the last hint computation
             if (this.needNewHints(session)) {
-                var offset          = session.getOffset(),
-                    scopeResponse   = ScopeManager.requestHints(session, session.editor.document);
+                var scopeResponse   = ScopeManager.requestHints(session, session.editor.document);
 
                 if (scopeResponse.hasOwnProperty("promise")) {
                     var $deferredHints = $.Deferred();
diff --git a/src/extensions/default/JavaScriptCodeHints/unittests.js b/src/extensions/default/JavaScriptCodeHints/unittests.js
index 808061e4863..6f8f1a5fc6f 100644
--- a/src/extensions/default/JavaScriptCodeHints/unittests.js
+++ b/src/extensions/default/JavaScriptCodeHints/unittests.js
@@ -39,9 +39,7 @@ define(function (require, exports, module) {
         testPath        = extensionPath + "/test/file1.js",
         testHtmlPath    = extensionPath + "/test/index.html",
         testDoc         = null,
-        testHtmlDoc     = null,
-        testEditor,
-        testHtmlEditor;
+        testEditor;
 
     /**
      * Returns an Editor suitable for use in isolation, given a Document. (Unlike
@@ -320,19 +318,6 @@ define(function (require, exports, module) {
             
         }
         
-        /**
-         * Should be called at the beginning of any tests for hints in an html file.
-         * Start a test int he index.html test file, instead
-         * of the file1.js file.
-         * This switches the document and editor to point to the html file
-         * and re-inits the hinting session with the html editor
-         */
-        function startHtmlTest() {
-            testEditor = testHtmlEditor;
-            testDoc = testHtmlDoc;
-            JSCodeHints.initializeSession(testEditor, false);
-        }
-        
         describe("JavaScript Code Hinting", function () {
    
             beforeEach(function () {
@@ -340,18 +325,13 @@ define(function (require, exports, module) {
                 DocumentManager.getDocumentForPath(testPath).done(function (doc) {
                     testDoc = doc;
                 });
-                DocumentManager.getDocumentForPath(testHtmlPath).done(function (doc) {
-                    testHtmlDoc = doc;
-                });
-                
                 waitsFor(function () {
-                    return testDoc !== null && testHtmlDoc !== null;
+                    return testDoc !== null;
                 }, "Unable to open test document", 10000);
                 
                 // create Editor instance (containing a CodeMirror instance)
                 runs(function () {
                     testEditor = createMockEditor(testDoc);
-                    testHtmlEditor = createMockEditor(testHtmlDoc);
                     JSCodeHints.initializeSession(testEditor, false);
                 });
             });
@@ -751,43 +731,6 @@ define(function (require, exports, module) {
                 });
             });
 
-            it("basic codehints in html file", function () {
-                var start = { line: 30, ch: 9 },
-                    end   = { line: 30, ch: 11 };
-                
-                startHtmlTest();
-                
-                testDoc.replaceRange("x.", start, start);
-                testEditor.setCursorPos(end);
-                var hintObj = expectHints(JSCodeHints.jsHintProvider);
-                runs(function () {
-                    hintsPresentOrdered(hintObj, ["charAt", "charCodeAt", "concat", "indexOf"]);
-                });
-            });
-
-            it("function type hint in html file", function () {
-                var start = { line: 29, ch: 12 };
-                
-                startHtmlTest();
-                
-                testEditor.setCursorPos(start);
-                var hintObj = expectHints(JSCodeHints.jsHintProvider);
-                runs(function () {
-                    hintsPresentExact(hintObj, ["foo(a: number) -> string"]);
-                });
-            });
-
-            it("jump-to-def in html file", function () {
-                var start = { line: 29, ch: 10 };
-                
-                startHtmlTest();
-                
-                testEditor.setCursorPos(start);
-                runs(function () {
-                    editorJumped({line: 18, ch: 20});
-                });
-            });
-
             it("should insert hint as [\"my-key\"] since 'my-key' is not a valid property name", function () {
                 var start = { line: 49, ch: 0 },
                     middle = { line: 49, ch: 5 },
@@ -836,6 +779,66 @@ define(function (require, exports, module) {
                 });
             });
         });
+        
+        describe("JavaScript Code Hinting in a HTML file", function () {
+   
+            beforeEach(function () {
+                
+                DocumentManager.getDocumentForPath(testHtmlPath).done(function (doc) {
+                    testDoc = doc;
+                });
+                
+                waitsFor(function () {
+                    return testDoc !== null;
+                }, "Unable to open test document", 10000);
+                
+                // create Editor instance (containing a CodeMirror instance)
+                runs(function () {
+                    testEditor = createMockEditor(testDoc);
+                    JSCodeHints.initializeSession(testEditor, false);
+                });
+            });
+            
+            afterEach(function () {
+                // The following call ensures that the document is reloaded 
+                // from disk before each test
+                DocumentManager.closeAll();
+                
+                SpecRunnerUtils.destroyMockEditor(testDoc);
+                testEditor = null;
+                testDoc = null;
+            });
 
+            it("basic codehints in html file", function () {
+                var start = { line: 30, ch: 9 },
+                    end   = { line: 30, ch: 11 };
+                
+                testDoc.replaceRange("x.", start, start);
+                testEditor.setCursorPos(end);
+                var hintObj = expectHints(JSCodeHints.jsHintProvider);
+                runs(function () {
+                    hintsPresentOrdered(hintObj, ["charAt", "charCodeAt", "concat", "indexOf"]);
+                });
+            });
+
+            it("function type hint in html file", function () {
+                var start = { line: 29, ch: 12 };
+                
+                testEditor.setCursorPos(start);
+                var hintObj = expectHints(JSCodeHints.jsHintProvider);
+                runs(function () {
+                    hintsPresentExact(hintObj, ["foo(a: number) -> string"]);
+                });
+            });
+
+            it("jump-to-def in html file", function () {
+                var start = { line: 29, ch: 10 };
+                
+                testEditor.setCursorPos(start);
+                runs(function () {
+                    editorJumped({line: 18, ch: 20});
+                });
+            });
+        });
     });
 });
\ No newline at end of file

From 64c7ea521e4fda8d4722ab66c6d7ddfbe6402d78 Mon Sep 17 00:00:00 2001
From: Erik Tierney <eztierney@gmail.com>
Date: Fri, 10 May 2013 10:28:50 -0400
Subject: [PATCH 6/6] update out of date comment

---
 src/language/HTMLUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
index 41b275754c8..3ae729593e6 100644
--- a/src/language/HTMLUtils.js
+++ b/src/language/HTMLUtils.js
@@ -491,7 +491,7 @@ define(function (require, exports, module) {
                 }
                 // Check for end of this block
                 if (tokenModeName !== modeName) {
-                    // currentStyleBlock.end is already set to pos of the last CSS token by now
+                    // currentBlock.end is already set to pos of the last token by now
                     currentBlock.text = editor.document.getRange(currentBlock.start, currentBlock.end);
                     inBlock = false;
                 } else {