Merge pull request #456 from mousetraps/i454

Fix #454 Don't show completions after "var" keyword

Author: mousetraps

Nodejs/Product/Nodejs/Intellisense/VsProjectAnalyzer.cs

@@ -1191,18 +1191,27 @@ private static CompletionAnalysis TrySpecialCompletions(ITextSnapshot snapshot,
                 if (range != null) {
                     start = range.Value.Start;
                 }
-            }
-
+            }
+
+            // Get the classifiers from beginning of the line to the beginning of snapSpan.
+            // The contents of snapSpan differ depending on what is determined in
+            // CompletionSource.GetApplicableSpan.
+            //
+            // In the case of:
+            //      var myIdentifier<cursor>
+            // the applicable span will be "myIdentifier", so GetClassificationSpans will operate on "var "
+            // 
+            // In the case of comments and string literals, the applicable span will be empty,
+            // so snapSpan.Start will occur at the current cursor position. 
             var tokens = classifier.GetClassificationSpans(new SnapshotSpan(start.GetContainingLine().Start, snapSpan.Start));
             if (tokens.Count > 0) {
                 // Check for context-sensitive intellisense
                 var lastClass = tokens[tokens.Count - 1];
 
-                if (lastClass.ClassificationType == classifier.Provider.Comment) {
-                    // No completions in comments
-                    return CompletionAnalysis.EmptyCompletionContext;
-                } else if (lastClass.ClassificationType == classifier.Provider.StringLiteral) {
-                    // String completion
+                if (lastClass.ClassificationType == classifier.Provider.Comment ||
+                    lastClass.ClassificationType == classifier.Provider.StringLiteral ||
+                    (lastClass.ClassificationType == classifier.Provider.Keyword && lastClass.Span.GetText() == "var")) {
+                    // No completions in comments, strings, or directly after "var" keywords.
                     return CompletionAnalysis.EmptyCompletionContext;
                 }
                 return null;

Nodejs/Tests/Core.UI/BasicIntellisense.cs

@@ -43,7 +43,6 @@ public void CtrlSpace() {
                 var server = solution.OpenItem("CtrlSpace", "server.js");
 
                 server.MoveCaret(2, 13);
-
                 solution.ExecuteCommand("Edit.CompleteWord");
 
                 server.WaitForText("var http = require('http');\r\nhttp.createServer");
@@ -268,6 +267,37 @@ public void IntellisenseAfterMultiLineComment() {
             }
         }
 
+        /// <summary>
+        /// https://github.com/Microsoft/nodejstools/issues/454
+        /// </summary>
+        [TestMethod, Priority(0), TestCategory("Core")]
+        [HostType("VSTestHost")]
+        public void IntellisenseAfterVarKeyword() {
+            var project = Project("IntellisenseAfterVarKeywordTest",
+                Compile("server", "var c \r\nexports.var = 3; exports.var ")
+            );
+
+            using (var solution = project.Generate().ToVs()) {
+                var server = solution.OpenItem("IntellisenseAfterVarKeywordTest", "server.js");
+
+                server.MoveCaret(1, 4);
+                Keyboard.Type(Keyboard.CtrlSpace.ToString());
+                using (var sh = server.WaitForSession<ICompletionSession>(true)) { }
+
+                server.MoveCaret(1, 6);
+                Keyboard.Type(Keyboard.CtrlSpace.ToString());
+                server.AssertNoIntellisenseSession();
+
+                server.MoveCaret(1, 7);
+                Keyboard.Type(Keyboard.CtrlSpace.ToString());
+                using (var sh = server.WaitForSession<ICompletionSession>(true)) { }
+
+                server.MoveCaret(2, 30);
+                Keyboard.Type(Keyboard.CtrlSpace.ToString());
+                using (var sh = server.WaitForSession<ICompletionSession>(true)) { }
+            }
+        }
+
         [TestMethod, Priority(0), TestCategory("Core")]
         [HostType("VSTestHost")]
         public void JSDocTest() {