diff --git a/src/extensions/default/JavaScriptCodeHints/HintUtils.js b/src/extensions/default/JavaScriptCodeHints/HintUtils.js
index 9a0d4066df3..60c462db893 100644
--- a/src/extensions/default/JavaScriptCodeHints/HintUtils.js
+++ b/src/extensions/default/JavaScriptCodeHints/HintUtils.js
@@ -29,10 +29,11 @@ define(function (require, exports, module) {
     var Acorn                       = require("node_modules/acorn/dist/acorn");
 
     var LANGUAGE_ID                 = "javascript",
+        TYPESCRIPT_LANGUAGE_ID      = "typescript",
         JSX_LANGUAGE_ID             = "jsx",
         HTML_LANGUAGE_ID            = "html",
         PHP_LANGUAGE_ID             = "php",
-        SUPPORTED_LANGUAGES         = [LANGUAGE_ID, JSX_LANGUAGE_ID, HTML_LANGUAGE_ID, PHP_LANGUAGE_ID],
+        SUPPORTED_LANGUAGES         = [LANGUAGE_ID, TYPESCRIPT_LANGUAGE_ID, JSX_LANGUAGE_ID, HTML_LANGUAGE_ID, PHP_LANGUAGE_ID],
         SINGLE_QUOTE                = "'",
         DOUBLE_QUOTE                = "\"";
 
diff --git a/src/language/languages.json b/src/language/languages.json
index 1de22f94d48..c1d13e0a9ea 100644
--- a/src/language/languages.json
+++ b/src/language/languages.json
@@ -70,6 +70,14 @@
         "lineComment": ["//"]
     },
 
+    "typescript": {
+        "name": "TypeScript",
+        "mode": ["javascript", "application/typescript"],
+        "fileExtensions": ["ts"],
+        "blockComment": ["/*", "*/"],
+        "lineComment": ["//"]
+    },
+
     "jsx": {
         "name": "JSX",
         "mode": "jsx",