Merge pull request #14730 from adobe/master

Merge master to release for 1.14 release

Author: shubhsnov

.eslintrc.js

@@ -80,5 +80,15 @@ module.exports = {
         "Uint32Array": false,
         "WebSocket": false,
         "XMLHttpRequest": false
+    },
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "script",
+        "ecmaFeatures": {
+          "arrowFunctions": true,
+          "binaryLiterals": true,
+          "blockBindings": true,
+          "classes": true
+        }
     }
 };

.travis.yml

@@ -2,6 +2,8 @@ language: node_js
 sudo: false # use container-based Travis infrastructure
 node_js:
   - "6"
+before_install:
+  - phpenv global 7.0 #switch to php7, since that's what php-Tooling extension requires
 before_script:
   - npm install -g grunt-cli
   - npm install -g jasmine-node

Gruntfile.js

@@ -82,6 +82,9 @@ module.exports = function (grunt) {
                         src: [
                             'extensibility/node/**',
                             'JSUtils/node/**',
+                            'languageTools/node/**',
+                            'languageTools/styles/**',
+                            'languageTools/LanguageClient/**',
                             '!extensibility/node/spec/**',
                             '!extensibility/node/node_modules/**/{test,tst}/**/*',
                             '!extensibility/node/node_modules/**/examples/**/*',

package.json

@@ -1,7 +1,7 @@
 {
     "name": "Brackets",
-    "version": "1.13.0-0",
-    "apiVersion": "1.13.0",
+    "version": "1.14.0-0",
+    "apiVersion": "1.14.0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets/issues"
@@ -64,7 +64,7 @@
     "scripts": {
         "prepush": "npm run eslint",
         "postinstall": "grunt install",
-        "test": "grunt test cla-check-pull",
+        "test": "grunt test",
         "eslint": "grunt eslint"
     },
     "licenses": [

src/base-config/keyboard.json

@@ -162,6 +162,9 @@
     "cmd.findInFiles":  [
         "Ctrl-Shift-F"
     ],
+    "cmd.findAllReferences":  [
+        "Shift-F12"
+    ],
     "cmd.replaceInFiles":  [
         {
             "key": "Ctrl-Shift-H"
@@ -281,6 +284,9 @@
     "navigate.gotoDefinition":  [
         "Ctrl-T"
     ],
+    "navigate.gotoDefinitionInProject":  [
+        "Ctrl-Shift-T"
+    ],
     "navigate.jumptoDefinition":  [
         "Ctrl-J"
     ],

src/brackets.config.dev.json

@@ -4,5 +4,6 @@
     "serviceKey"                 : "brackets-service",
     "environment"                : "stage",
     "update_info_url"            : "https://s3.amazonaws.com/files.brackets.io/updates/prerelease/<locale>.json",
+    "notification_info_url"      : "https://s3.amazonaws.com/files.brackets.io/notifications/prerelease/<locale>.json",
     "buildtype"                  : "dev"
 }

src/brackets.config.dist.json

@@ -4,5 +4,6 @@
     "serviceKey"              : "brackets-service",
     "environment"             : "production",
     "update_info_url"         : "https://getupdates.brackets.io/getupdates/",
+    "notification_info_url"   : "https://getupdates.brackets.io/getnotifications?locale=<locale>",
     "buildtype"               : "production"
 }

src/brackets.config.prerelease.json

@@ -4,5 +4,6 @@
     "serviceKey"              : "brackets-service",
     "environment"             : "production",
     "update_info_url"         : "https://s3.amazonaws.com/files.brackets.io/updates/prerelease/<locale>.json",
+    "notification_info_url"   : "https://s3.amazonaws.com/files.brackets.io/notifications/prerelease/<locale>.json",
     "buildtype"               : "prerelease"
 }

src/brackets.js

@@ -137,6 +137,10 @@ define(function (require, exports, module) {
             return PathUtils;
         }
     });
+    
+    //load language features
+    require("features/ParameterHintsManager");
+    require("features/JumpToDefManager");
 
     // Load modules that self-register and just need to get included in the main project
     require("command/DefaultMenus");
@@ -151,10 +155,22 @@ define(function (require, exports, module) {
     require("search/FindInFilesUI");
     require("search/FindReplace");
 
+    //Load find References Feature Manager
+    require("features/FindReferencesManager");
+
     //Load common JS module
     require("JSUtils/Session");
     require("JSUtils/ScopeManager");
 
+    //load Language Tools Module
+    require("languageTools/PathConverters");
+    require("languageTools/LanguageTools");
+    require("languageTools/ClientLoader");
+    require("languageTools/BracketsToNodeInterface");
+    require("languageTools/DefaultProviders");
+    require("languageTools/DefaultEventHandlers");
+
+
     PerfUtils.addMeasurement("brackets module dependencies resolved");
 
     // Local variables

src/command/Commands.js

@@ -97,6 +97,7 @@ define(function (require, exports, module) {
     exports.CMD_REPLACE                 = "cmd.replace";                // FindReplace.js               _replace()
     exports.CMD_REPLACE_IN_FILES        = "cmd.replaceInFiles";         // FindInFilesUI.js             _showReplaceBar()
     exports.CMD_REPLACE_IN_SUBTREE      = "cmd.replaceInSubtree";       // FindInFilesUI.js             _showReplaceBarForSubtree()
+    exports.CMD_FIND_ALL_REFERENCES     = "cmd.findAllReferences";      // findReferencesManager.js     _openReferencesPanel()
 
     // VIEW
     exports.CMD_THEMES_OPEN_SETTINGS    = "view.themesOpenSetting";     // MenuCommands.js              Settings.open()
@@ -123,8 +124,9 @@ define(function (require, exports, module) {
     exports.NAVIGATE_SHOW_IN_FILE_TREE  = "navigate.showInFileTree";    // DocumentCommandHandlers.js   handleShowInTree()
     exports.NAVIGATE_SHOW_IN_OS         = "navigate.showInOS";          // DocumentCommandHandlers.js   handleShowInOS()
     exports.NAVIGATE_QUICK_OPEN         = "navigate.quickOpen";         // QuickOpen.js                 doFileSearch()
-    exports.NAVIGATE_JUMPTO_DEFINITION  = "navigate.jumptoDefinition";  // EditorManager.js             _doJumpToDef()
+    exports.NAVIGATE_JUMPTO_DEFINITION  = "navigate.jumptoDefinition";  // JumpToDefManager.js             _doJumpToDef()
     exports.NAVIGATE_GOTO_DEFINITION    = "navigate.gotoDefinition";    // QuickOpen.js                 doDefinitionSearch()
+    exports.NAVIGATE_GOTO_DEFINITION_PROJECT = "navigate.gotoDefinitionInProject";    // QuickOpen.js                 doDefinitionSearchInProject()
     exports.NAVIGATE_GOTO_LINE          = "navigate.gotoLine";          // QuickOpen.js                 doGotoLine()
     exports.NAVIGATE_GOTO_FIRST_PROBLEM = "navigate.gotoFirstProblem";  // CodeInspection.js            handleGotoFirstProblem()
     exports.TOGGLE_QUICK_EDIT           = "navigate.toggleQuickEdit";   // EditorManager.js             _toggleInlineWidget()