diff --git a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs
index b096055fa..17e10af4e 100644
--- a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs
+++ b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs
@@ -28,14 +28,15 @@ private void InitializeComponent() {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NodejsIntellisenseOptionsControl));
this.outerLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.advancedOptionsLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
- this._nodejsES5IntelliSenseOptionsControl = new Microsoft.NodejsTools.Options.NodeLsIntellisenseOptionsControl();
- this._salsaLsIntellisenseOptionsControl = new Microsoft.NodejsTools.Options.SalsaLsIntellisenseOptionsControl();
this.intelliSenseModeLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this._intelliSenseModeDropdown = new System.Windows.Forms.ComboBox();
this.intelliSenseModeLabel = new System.Windows.Forms.Label();
this._analysisPreviewFeedbackLinkLabel = new System.Windows.Forms.LinkLabel();
this._es5DeprecatedWarning = new System.Windows.Forms.Label();
this.horizontalDivider = new System.Windows.Forms.Label();
+ this._nodejsES5IntelliSenseOptionsControl = new Microsoft.NodejsTools.Options.NodeLsIntellisenseOptionsControl();
+ this._salsaLsIntellisenseOptionsControl = new Microsoft.NodejsTools.Options.SalsaLsIntellisenseOptionsControl();
+ this._es6BottomPadding = new System.Windows.Forms.Label();
toolTip = new System.Windows.Forms.ToolTip(this.components);
this.outerLayoutPanel.SuspendLayout();
this.advancedOptionsLayoutPanel.SuspendLayout();
@@ -57,16 +58,6 @@ private void InitializeComponent() {
this.advancedOptionsLayoutPanel.Controls.Add(this._salsaLsIntellisenseOptionsControl, 0, 0);
this.advancedOptionsLayoutPanel.Name = "advancedOptionsLayoutPanel";
//
- // _nodejsES5IntelliSenseOptionsControl
- //
- resources.ApplyResources(this._nodejsES5IntelliSenseOptionsControl, "_nodejsES5IntelliSenseOptionsControl");
- this._nodejsES5IntelliSenseOptionsControl.Name = "_nodejsES5IntelliSenseOptionsControl";
- //
- // _salsaLsIntellisenseOptionsControl
- //
- resources.ApplyResources(this._salsaLsIntellisenseOptionsControl, "_salsaLsIntellisenseOptionsControl");
- this._salsaLsIntellisenseOptionsControl.Name = "_salsaLsIntellisenseOptionsControl";
- //
// intelliSenseModeLayoutPanel
//
resources.ApplyResources(this.intelliSenseModeLayoutPanel, "intelliSenseModeLayoutPanel");
@@ -74,6 +65,7 @@ private void InitializeComponent() {
this.intelliSenseModeLayoutPanel.Controls.Add(this.intelliSenseModeLabel, 0, 0);
this.intelliSenseModeLayoutPanel.Controls.Add(this._analysisPreviewFeedbackLinkLabel, 1, 2);
this.intelliSenseModeLayoutPanel.Controls.Add(this._es5DeprecatedWarning, 1, 1);
+ this.intelliSenseModeLayoutPanel.Controls.Add(this._es6BottomPadding, 1, 3);
this.intelliSenseModeLayoutPanel.Name = "intelliSenseModeLayoutPanel";
//
// _intelliSenseModeDropdown
@@ -108,6 +100,22 @@ private void InitializeComponent() {
this.horizontalDivider.ForeColor = System.Drawing.SystemColors.Control;
this.horizontalDivider.Name = "horizontalDivider";
//
+ // _nodejsES5IntelliSenseOptionsControl
+ //
+ resources.ApplyResources(this._nodejsES5IntelliSenseOptionsControl, "_nodejsES5IntelliSenseOptionsControl");
+ this._nodejsES5IntelliSenseOptionsControl.Name = "_nodejsES5IntelliSenseOptionsControl";
+ //
+ // _salsaLsIntellisenseOptionsControl
+ //
+ resources.ApplyResources(this._salsaLsIntellisenseOptionsControl, "_salsaLsIntellisenseOptionsControl");
+ this._salsaLsIntellisenseOptionsControl.Name = "_salsaLsIntellisenseOptionsControl";
+ //
+ // _es6BottomPadding
+ //
+ resources.ApplyResources(this._es6BottomPadding, "_es6BottomPadding");
+ this._es6BottomPadding.ForeColor = System.Drawing.SystemColors.Control;
+ this._es6BottomPadding.Name = "_es6BottomPadding";
+ //
// NodejsIntellisenseOptionsControl
//
resources.ApplyResources(this, "$this");
@@ -137,5 +145,6 @@ private void InitializeComponent() {
private System.Windows.Forms.ComboBox _intelliSenseModeDropdown;
private System.Windows.Forms.LinkLabel _analysisPreviewFeedbackLinkLabel;
private System.Windows.Forms.Label _es5DeprecatedWarning;
+ private System.Windows.Forms.Label _es6BottomPadding;
}
}
diff --git a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs
index 51f21f350..b1ad60c33 100644
--- a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs
+++ b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs
@@ -69,6 +69,11 @@ private void _intelliSenseModeDropdown_SelectedValueChanged(object sender, Event
bool isES6PreviewIntelliSense = _intelliSenseModeDropdown.SelectedItem == _ecmaScript6;
_nodejsES5IntelliSenseOptionsControl.Visible = !isES6PreviewIntelliSense;
_es5DeprecatedWarning.Visible = !isES6PreviewIntelliSense;
+
+ // Enables us to auto-size the IntelliSense selection area without reflowing the entire page
+ _es6BottomPadding.Visible = isES6PreviewIntelliSense;
+
+ // IntelliSense Options are controlled by the built-in language service in DEV15+
#if DEV14
_salsaLsIntellisenseOptionsControl.Visible = isES6PreviewIntelliSense;
#else
diff --git a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.resx b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.resx
index 791ec86d0..ba67c3d57 100644
--- a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.resx
+++ b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.resx
@@ -217,7 +217,7 @@
Top
- 12, 115
+ 12, 140
12, 12, 12, 0
@@ -246,6 +246,9 @@
<?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="_nodejsES5IntelliSenseOptionsControl" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="_salsaLsIntellisenseOptionsControl" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0" /></TableLayoutSettings>
+
+ True
+
GrowAndShrink
@@ -372,6 +375,30 @@
3
+
+ True
+
+
+ 192, 89
+
+
+ 0, 25
+
+
+ 4
+
+
+ _es6BottomPadding
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ intelliSenseModeLayoutPanel
+
+
+ 4
+
Fill
@@ -382,10 +409,10 @@
12, 0, 12, 12
- 3
+ 4
- 711, 89
+ 711, 114
0
@@ -403,7 +430,7 @@
1
- <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="_intelliSenseModeDropdown" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="intelliSenseModeLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="_analysisPreviewFeedbackLinkLabel" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="_es5DeprecatedWarning" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings>
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="_intelliSenseModeDropdown" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="intelliSenseModeLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="_analysisPreviewFeedbackLinkLabel" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="_es5DeprecatedWarning" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="_es6BottomPadding" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings>
Top
@@ -412,7 +439,7 @@
NoControl
- 12, 101
+ 12, 126
12, 0, 12, 0
@@ -454,7 +481,7 @@
3
- 735, 720
+ 735, 745
0
@@ -496,7 +523,7 @@
6, 6, 0, 6
- 735, 720
+ 735, 745
toolTip