Merge pull request #14730 from adobe/master

Merge master to release for 1.14 release
adobe · Apr 26, 2019 · 329d08f · 329d08f
2 parents 49d29a8 + ee01b79
commit 329d08f
Show file tree

Hide file tree

Showing 104 changed files with 10,905 additions and 809 deletions.
diff --git a/.eslintrc.js b/.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
+        }
     }
 };
diff --git a/.travis.yml b/.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

diff --git a/Gruntfile.js b/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/**/*',

diff --git a/package.json b/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": [

diff --git a/src/base-config/keyboard.json b/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"
     ],

diff --git a/src/brackets.config.dev.json b/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"
 }
diff --git a/src/brackets.config.dist.json b/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"
 }
diff --git a/src/brackets.config.prerelease.json b/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"
 }
diff --git a/src/brackets.js b/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

diff --git a/src/command/Commands.js b/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()

diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js
@@ -136,6 +136,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.CMD_SKIP_CURRENT_MATCH);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.CMD_FIND_IN_FILES);
+        menu.addMenuItem(Commands.CMD_FIND_ALL_REFERENCES);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.CMD_REPLACE);
         menu.addMenuItem(Commands.CMD_REPLACE_IN_FILES);
@@ -172,6 +173,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.NAVIGATE_QUICK_OPEN);
         menu.addMenuItem(Commands.NAVIGATE_GOTO_LINE);
         menu.addMenuItem(Commands.NAVIGATE_GOTO_DEFINITION);
+        menu.addMenuItem(Commands.NAVIGATE_GOTO_DEFINITION_PROJECT);
         menu.addMenuItem(Commands.NAVIGATE_JUMPTO_DEFINITION);
         menu.addMenuItem(Commands.NAVIGATE_GOTO_FIRST_PROBLEM);
         menu.addMenuDivider();
@@ -282,6 +284,7 @@ define(function (require, exports, module) {
         // editor_cmenu.addMenuItem(Commands.NAVIGATE_JUMPTO_DEFINITION);
         editor_cmenu.addMenuItem(Commands.TOGGLE_QUICK_EDIT);
         editor_cmenu.addMenuItem(Commands.TOGGLE_QUICK_DOCS);
+        editor_cmenu.addMenuItem(Commands.CMD_FIND_ALL_REFERENCES);
         editor_cmenu.addMenuDivider();
         editor_cmenu.addMenuItem(Commands.EDIT_CUT);
         editor_cmenu.addMenuItem(Commands.EDIT_COPY);

diff --git a/src/config.json b/src/config.json
@@ -26,8 +26,8 @@
         "update_info_url": "https://s3.amazonaws.com/files.brackets.io/updates/prerelease/<locale>.json"
     },
     "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"
@@ -90,7 +90,7 @@
     "scripts": {
         "prepush": "npm run eslint",
         "postinstall": "grunt install",
-        "test": "grunt test cla-check-pull",
+        "test": "grunt test",
         "eslint": "grunt eslint"
     },
     "licenses": [

diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -689,6 +689,15 @@ define(function (require, exports, module) {
         var doc = DocumentManager.createUntitledDocument(_nextUntitledIndexToUse++, defaultExtension);
         MainViewManager._edit(MainViewManager.ACTIVE_PANE, doc);
 
+        HealthLogger.sendAnalyticsData(
+            HealthLogger.commonStrings.USAGE +
+            HealthLogger.commonStrings.FILE_OPEN +
+            HealthLogger.commonStrings.FILE_NEW,
+            HealthLogger.commonStrings.USAGE,
+            HealthLogger.commonStrings.FILE_OPEN,
+            HealthLogger.commonStrings.FILE_NEW
+        );
+
         return new $.Deferred().resolve(doc).promise();
     }
 
@@ -788,6 +797,7 @@ define(function (require, exports, module) {
                 .done(function () {
                     docToSave.notifySaved();
                     result.resolve(file);
+                    HealthLogger.fileSaved(docToSave);
                 })
                 .fail(function (err) {
                     if (err === FileSystemError.CONTENTS_MODIFIED) {
@@ -967,6 +977,7 @@ define(function (require, exports, module) {
                     } else {
                         openNewFile();
                     }
+                    HealthLogger.fileSaved(doc);
                 })
                 .fail(function (error) {
                     _showSaveFileError(error, path)
@@ -1186,6 +1197,7 @@ define(function (require, exports, module) {
         function doClose(file) {
             if (!promptOnly) {
                 MainViewManager._close(paneId, file);
+                HealthLogger.fileClosed(file);
             }
         }
 

diff --git a/src/editor/CodeHintList.js b/src/editor/CodeHintList.js
@@ -152,7 +152,7 @@ define(function (require, exports, module) {
             ViewUtils.scrollElementIntoView($view, $item, false);
 
             if (this.handleHighlight) {
-                this.handleHighlight($item.find("a"));
+                this.handleHighlight($item.find("a"), this.$hintMenu.find("#codehint-desc"));
             }
         }
     };
@@ -191,6 +191,7 @@ define(function (require, exports, module) {
 
         this.hints = hintObj.hints;
         this.hints.handleWideResults = hintObj.handleWideResults;
+        this.enableDescription = hintObj.enableDescription;
 
         // if there is no match, assume name is already a formatted jQuery
         // object; otherwise, use match to format name for display.
@@ -265,6 +266,13 @@ define(function (require, exports, module) {
             // attach to DOM
             $parent.append($ul);
 
+            // If a a description field requested attach one
+            if (this.enableDescription) {
+                // Remove the desc element first to ensure DOM order
+                $parent.find("#codehint-desc").remove();
+                $parent.append("<div id='codehint-desc' class='dropdown-menu quiet-scrollbars'></div>");
+                $ul.addClass("withDesc");
+            }
             this._setSelectedIndex(selectInitial ? 0 : -1);
         }
     };
@@ -283,7 +291,9 @@ define(function (require, exports, module) {
             textHeight  = this.editor.getTextHeight(),
             $window     = $(window),
             $menuWindow = this.$hintMenu.children("ul"),
-            menuHeight  = $menuWindow.outerHeight();
+            $descElement = this.$hintMenu.find("#codehint-desc"),
+            descOverhang = $descElement.length === 1 ? $descElement.height() : 0,
+            menuHeight  = $menuWindow.outerHeight() + descOverhang;
 
         // TODO Ty: factor out menu repositioning logic so code hints and Context menus share code
         // adjust positioning so menu is not clipped off bottom or right
@@ -304,6 +314,13 @@ define(function (require, exports, module) {
             availableWidth = menuWidth + Math.abs(rightOverhang);
         }
 
+        //Creating the offset element for hint description element
+        var descOffset = this.$hintMenu.find("ul.dropdown-menu")[0].getBoundingClientRect().height;
+        if (descOffset === 0) {
+            descOffset = menuHeight - descOverhang;
+        }
+        this.$hintMenu.find("#codehint-desc").css("margin-top", descOffset - 1);
+
         return {left: posLeft, top: posTop, width: availableWidth};
     };
 

diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js
@@ -507,10 +507,21 @@ define(function (require, exports, module) {
 
             sessionEditor = editor;
             hintList = new CodeHintList(sessionEditor, insertHintOnTab, maxCodeHints);
-            hintList.onHighlight(function ($hint) {
-                // If the current hint provider listening for hint item highlight change
-                if (sessionProvider.onHighlight) {
-                    sessionProvider.onHighlight($hint);
+            hintList.onHighlight(function ($hint, $hintDescContainer) {
+                if (hintList.enableDescription && $hintDescContainer && $hintDescContainer.length) {
+                    // If the current hint provider listening for hint item highlight change
+                    if (sessionProvider.onHighlight) {
+                        sessionProvider.onHighlight($hint, $hintDescContainer);
+                    }
+
+                    // Update the hint description
+                    if (sessionProvider.updateHintDescription) {
+                        sessionProvider.updateHintDescription($hint, $hintDescContainer);
+                    }
+                } else {
+                    if (sessionProvider.onHighlight) {
+                        sessionProvider.onHighlight($hint);
+                    }
                 }
             });
             hintList.onSelect(function (hint) {