Undo temporary 'using' keyword hack

Author: alexgav

l10n/bundle.l10n.json

@@ -119,7 +119,6 @@
   "Unexpected error when attaching to C# preview window.": "Unexpected error when attaching to C# preview window.",
   "Razor C# copied to clipboard": "Razor C# copied to clipboard",
   "Copy C#": "Copy C#",
-  "{0} Keyword": "{0} Keyword",
   "Unexpected completion trigger kind: {0}": "Unexpected completion trigger kind: {0}",
   "1 reference": "1 reference",
   "{0} references": "{0} references",

src/razor/src/completion/provisionalCompletionOrchestrator.ts

@@ -134,8 +134,7 @@ export class ProvisionalCompletionOrchestrator {
             htmlPosition,
             provisionalPosition,
             completionContext,
-            projection.languageKind,
-            newDocument
+            projection.languageKind
         );
 
         // We track when we add provisional dots to avoid doing unnecessary work on commonly invoked events.

src/razor/src/completion/razorCompletionItemProvider.ts

@@ -30,8 +30,7 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
         hostDocumentPosition: vscode.Position,
         projectedPosition: vscode.Position,
         context: vscode.CompletionContext,
-        language: LanguageKind,
-        razorDocument: vscode.TextDocument
+        language: LanguageKind
     ) {
         if (projectedUri) {
             // "@" is not a valid trigger character for C# / HTML and therefore we need to translate
@@ -172,8 +171,6 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
                 }
             }
 
-            this.addUsingKeyword(language, razorDocument, hostDocumentPosition, completionItems);
-
             const isIncomplete = completions instanceof Array ? false : completions ? completions.isIncomplete : false;
             return new vscode.CompletionList(completionItems, isIncomplete);
         }
@@ -229,8 +226,7 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
             position,
             projection.position,
             context,
-            projection.languageKind,
-            document
+            projection.languageKind
         );
 
         return completionList;
@@ -287,38 +283,6 @@ export class RazorCompletionItemProvider extends RazorLanguageFeatureBase implem
 
         return item;
     }
-
-    private static addUsingKeyword(
-        language: LanguageKind,
-        razorDocument: vscode.TextDocument,
-        hostDocumentPosition: vscode.Position,
-        completionItems: vscode.CompletionItem[]
-    ) {
-        // This is an ugly hack, but it's needed to get the "using" keyword to show up in the completion list.
-        // The reason it doesn't show up is because the C# generated document puts the position of the cursor
-        // at '__o = [||]', which isn't a valid location for a using statement.
-        if (language == LanguageKind.CSharp) {
-            const line = razorDocument.lineAt(hostDocumentPosition.line);
-            const lineText = line.text.substring(0, hostDocumentPosition.character);
-            if (
-                lineText.endsWith('@') ||
-                lineText.endsWith(
-                    '@u' ||
-                        lineText.endsWith('@us') ||
-                        lineText.endsWith('@usi') ||
-                        lineText.endsWith('@usin') ||
-                        lineText.endsWith('@using')
-                )
-            ) {
-                const usingItem = new vscode.CompletionItem('using', vscode.CompletionItemKind.Keyword);
-
-                // Matching Roslyn's documentation behavior
-                (<CompletionItem>usingItem).documentation = vscode.l10n.t('{0} Keyword', 'using');
-
-                completionItems.push(usingItem);
-            }
-        }
-    }
 }
 
 function getTriggerKind(triggerKind: vscode.CompletionTriggerKind): CompletionTriggerKind {