Fix issue with Brackets Sprint 21

Author: tomsdev

README.md

@@ -25,9 +25,9 @@ Reload **Brackets** and try it!
 You can open a **TypeScript project** or the **sample project** given 
 with this extension in the Sample folder.
 
-##Notes
+##Compatibility
 
-* Syntax highlighting on TypeScript files only works with Brackets version sprint 20 (and later).
+* Tested on Mac and PC with Brackets version sprint 21.
 
 ##Roadmap
 

TypeScript/TypeScriptService.js

@@ -115,18 +115,12 @@ define(function (require, exports, module) {
         }
 
         var fullPath = current.document.file.fullPath;
-        // Change the current mode to typescript if the file has the extension .ts
-        // We have to do this because typescript mode is not defined in Brackets
-        // for the moment (in EditorUtils.js)
-        if (PathUtils.hasExtensions(fullPath, ["ts"])) {
-            current.setModeForDocument("text/typescript");
-        }
 
         // Here we could detach the session from the previous editor
         //if (_currentSession && previous) { }
 
         _currentSession = null;
-        if (current.getModeForSelection() === TypeScriptUtils.MODE_NAME) {
+        if (current.getLanguageForSelection().getId() === TypeScriptUtils.LANGUAGE_ID) {
             console.log("Current session changing to: ", fullPath);
 
             getSession(current.document).done(function (session) {

TypeScript/TypeScriptUtils.js

@@ -29,7 +29,8 @@ define(function (require, exports, module) {
     "use strict";
 
     var MODE_NAME = "text/typescript";
-    
+    var LANGUAGE_ID = "typescript";
+
     /**
      * Get a typescript-specific event name
      */
@@ -83,6 +84,7 @@ define(function (require, exports, module) {
 
     // Define public API
     exports.MODE_NAME      = MODE_NAME;
+    exports.LANGUAGE_ID    = LANGUAGE_ID;
     exports.eventName      = eventName;
     exports.getObjectsDiff = getObjectsDiff;
     exports.getObjectKeys  = getObjectKeys;

TypeScriptQuickEdit/main.js

@@ -84,7 +84,8 @@ define(function (require, exports, module) {
     function typeScriptFunctionProvider(hostEditor, pos) {
         var result = new $.Deferred();
         // Only provide a TypeScript editor when cursor is in TypeScript content
-        if (hostEditor.getModeForSelection() !== TypeScriptUtils.MODE_NAME) {
+        var languageId = hostEditor.getLanguageForSelection().getId();
+        if (languageId !== TypeScriptUtils.LANGUAGE_ID) {
             return null;
         }
         // Only provide TypeScript editor if the selection is within a single line

main.js

@@ -28,6 +28,16 @@
 define(function (require, exports, module) {
     "use strict";
 
+    var LanguageManager = brackets.getModule("language/LanguageManager");
+
+    LanguageManager.defineLanguage("typescript", {
+        name: "TypeScript",
+        mode: ["javascript", "text/typescript"],
+        fileExtensions: ["ts"],
+        blockComment: ["/*", "*/"],
+        lineComment: "//"
+    });
+
     exports.TypeScript          = require("TypeScript/main");
     exports.TypeScriptQuickEdit = require("TypeScriptQuickEdit/main");
     exports.TypeScriptCodeHints = require("TypeScriptCodeHints/main");