Merge pull request #445 from mousetraps/i310

#310 Default to requiring tab to trigger a completion Remove the custom committed-by characters setting and also default to requiring tab/enter triggering a completion. This simplifies settings, is consistent with both C# and JS projects in VS2015, and makes it easier to work with identifiers that don't appear in the completions list. Fix #310, related to #179
microsoft · Sep 14, 2015 · 370d1ab · 370d1ab
2 parents 2a7aabb + e8ce562
commit 370d1ab
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 222 deletions.
diff --git a/Nodejs/Product/Nodejs/Commands/DiagnosticsCommand.cs b/Nodejs/Product/Nodejs/Commands/DiagnosticsCommand.cs
@@ -165,7 +165,7 @@ private string GetData() {
                 }
             }
 
-            res.AppendLine(String.Format("Intellisense Completion Committed By: {0}", NodejsPackage.Instance.IntellisenseOptionsPage.CompletionCommittedBy));
+            res.AppendLine(String.Format("IntelliSense Completion Only Tab or Enter to Commit: {0}", NodejsPackage.Instance.IntellisenseOptionsPage.OnlyTabOrEnterToCommit));
             res.AppendLine();
 
             return res.ToString();

diff --git a/Nodejs/Product/Nodejs/Intellisense/IntellisenseController.cs b/Nodejs/Product/Nodejs/Intellisense/IntellisenseController.cs
@@ -495,8 +495,8 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
                                 committedBy = "\"";
                             }
                         } else {
-                            committedBy = NodejsPackage.Instance != null ?
-                                NodejsPackage.Instance.IntellisenseOptionsPage.CompletionCommittedBy :
+                            committedBy = NodejsPackage.Instance != null && NodejsPackage.Instance.IntellisenseOptionsPage.OnlyTabOrEnterToCommit ?
+                                string.Empty :
                                 NodejsConstants.DefaultIntellisenseCompletionCommittedBy;
                         }
 

diff --git a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.Designer.cs
diff --git a/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs b/Nodejs/Product/Nodejs/Options/NodejsIntellisenseOptionsControl.cs
@@ -102,26 +102,26 @@ internal int AnalysisLogMaximum {
             }
         }
 
-        internal string CompletionCommittedBy {
-            get {
-                return _completionCommittedBy.Text;
-            }
-            set {
-                _completionCommittedBy.Text = value;
-            }
+        internal bool OnlyTabOrEnterToCommit {
+            get {
+                return _onlyTabOrEnterToCommit.Checked;
+            }
+            set {
+                _onlyTabOrEnterToCommit.Checked = value;
+            }
         }
 
         internal void SyncPageWithControlSettings(NodejsIntellisenseOptionsPage page) {
             page.AnalysisLevel = AnalysisLevel;
             page.AnalysisLogMax = AnalysisLogMaximum;
-            page.CompletionCommittedBy = CompletionCommittedBy;
+            page.OnlyTabOrEnterToCommit = OnlyTabOrEnterToCommit;
             page.SaveToDisk = SaveToDisk;
         }
 
         internal void SyncControlWithPageSettings(NodejsIntellisenseOptionsPage page) {
             AnalysisLevel = page.AnalysisLevel;
             AnalysisLogMaximum = page.AnalysisLogMax;
-            CompletionCommittedBy = page.CompletionCommittedBy;
+            OnlyTabOrEnterToCommit = page.OnlyTabOrEnterToCommit;
             SaveToDisk = page.SaveToDisk;
         }