feat: provide snippets for attribute

Author: ivanwonder

client/src/client.ts

@@ -454,6 +454,12 @@ function constructArgs(ctx: vscode.ExtensionContext): string[] {
     args.push('--includeAutomaticOptionalChainCompletions');
   }
 
+  const includeCompletionsWithSnippetText =
+      config.get<boolean>('angular.suggest.includeCompletionsWithSnippetText');
+  if (includeCompletionsWithSnippetText) {
+    args.push('--includeCompletionsWithSnippetText');
+  }
+
   const tsdk: string|null = config.get('typescript.tsdk', null);
   const tsProbeLocations = getProbeLocations(tsdk, ctx.extensionPath);
   args.push('--tsProbeLocations', tsProbeLocations.join(','));

package.json

@@ -118,6 +118,11 @@
           "type": "boolean",
           "default": true,
           "description": "Enable/disable showing completions on potentially undefined values that insert an optional chain call. Requires TS 3.7+ and strict null checks to be enabled."
+        },
+        "angular.suggest.includeCompletionsWithSnippetText": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable/disable snippet completions from angular language Server. Requires using TypeScript 4.3+ in the workspace."
         }
       }
     },

server/src/cmdline_utils.ts

@@ -38,6 +38,7 @@ interface CommandLineOptions {
   ngProbeLocations: string[];
   tsProbeLocations: string[];
   includeAutomaticOptionalChainCompletions: boolean;
+  includeCompletionsWithSnippetText: boolean;
 }
 
 export function parseCommandLine(argv: string[]): CommandLineOptions {
@@ -51,6 +52,7 @@ export function parseCommandLine(argv: string[]): CommandLineOptions {
     tsProbeLocations: parseStringArray(argv, '--tsProbeLocations'),
     includeAutomaticOptionalChainCompletions:
         hasArgument(argv, '--includeAutomaticOptionalChainCompletions'),
+    includeCompletionsWithSnippetText: hasArgument(argv, '--includeCompletionsWithSnippetText'),
   };
 }
 

server/src/completion.ts

@@ -125,6 +125,9 @@ export function tsCompletionEntryToLspCompletionItem(
     // range will include the dot. the `insertText` should be assigned to the `filterText` to filter
     // the completion items.
     item.filterText = entry.insertText;
+    if (entry.isSnippet) {
+      item.insertTextFormat = lsp.InsertTextFormat.Snippet;
+    }
   }
 
   item.data = {

server/src/server.ts

@@ -44,7 +44,8 @@ function main() {
     resolvedNgLsPath: ng.resolvedPath,
     ivy: isG3 ? true : options.ivy,
     logToConsole: options.logToConsole,
-    includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions
+    includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
+    includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
   });
 
   // Log initialization info

server/src/session.ts

@@ -31,6 +31,7 @@ export interface SessionOptions {
   ivy: boolean;
   logToConsole: boolean;
   includeAutomaticOptionalChainCompletions: boolean;
+  includeCompletionsWithSnippetText: boolean;
 }
 
 enum LanguageId {
@@ -55,6 +56,8 @@ export class Session {
   private readonly logToConsole: boolean;
   private readonly openFiles = new MruTracker();
   private readonly includeAutomaticOptionalChainCompletions: boolean;
+  private readonly includeCompletionsWithSnippetText: boolean;
+  private snippetSupport: boolean|undefined;
   // Tracks the spawn order and status of the `ngcc` processes. This allows us to ensure we enable
   // the LS in the same order the projects were created in.
   private projectNgccQueue: Array<{project: ts.server.Project, done: boolean}> = [];
@@ -72,6 +75,7 @@ export class Session {
   constructor(options: SessionOptions) {
     this.includeAutomaticOptionalChainCompletions =
         options.includeAutomaticOptionalChainCompletions;
+    this.includeCompletionsWithSnippetText = options.includeCompletionsWithSnippetText;
     this.logger = options.logger;
     this.ivy = options.ivy;
     this.logToConsole = options.logToConsole;
@@ -604,6 +608,8 @@ export class Session {
   }
 
   private onInitialize(params: lsp.InitializeParams): lsp.InitializeResult {
+    this.snippetSupport =
+        params.capabilities.textDocument?.completion?.completionItem?.snippetSupport;
     const serverOptions: ServerOptions = {
       logFile: this.logger.getLogFileName(),
     };
@@ -1006,10 +1012,14 @@ export class Session {
     const offset = lspPositionToTsPosition(scriptInfo, params.position);
 
     let options: ts.GetCompletionsAtPositionOptions = {};
-    if (this.includeAutomaticOptionalChainCompletions) {
+    const includeCompletionsWithSnippetText =
+        this.includeCompletionsWithSnippetText && this.snippetSupport;
+    if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText) {
       options = {
         includeAutomaticOptionalChainCompletions: this.includeAutomaticOptionalChainCompletions,
-        includeCompletionsWithInsertText: this.includeAutomaticOptionalChainCompletions,
+        includeCompletionsWithSnippetText: this.includeCompletionsWithSnippetText,
+        includeCompletionsWithInsertText:
+            this.includeAutomaticOptionalChainCompletions || this.includeCompletionsWithSnippetText,
       };
     }