fixup! feat: add config to enable auto-apply optional chaining on nullable symbol

Author: ivanwonder

integration/lsp/ivy_spec.ts

@@ -15,7 +15,7 @@ import {URI} from 'vscode-uri';
 import {ProjectLanguageService, ProjectLanguageServiceParams, SuggestStrictMode, SuggestStrictModeParams} from '../../common/notifications';
 import {NgccProgress, NgccProgressToken, NgccProgressType} from '../../common/progress';
 import {GetComponentsWithTemplateFile, GetTcbRequest, IsInAngularProject} from '../../common/requests';
-import {APP_COMPONENT, APP_COMPONENT_URI, FOO_COMPONENT_URI, FOO_TEMPLATE, FOO_TEMPLATE_URI, PROJECT_PATH, TSCONFIG} from '../test_constants';
+import {APP_COMPONENT, APP_COMPONENT_URI, FOO_COMPONENT, FOO_COMPONENT_URI, FOO_TEMPLATE, FOO_TEMPLATE_URI, PROJECT_PATH, TSCONFIG} from '../test_constants';
 
 import {createConnection, createTracer, initializeServer, openTextDocument} from './test_utils';
 
@@ -197,7 +197,8 @@ describe('Angular Ivy language server', () => {
       }))!;
       expect(response).not.toBeNull();
       expect(response.signatures.length).toEqual(1);
-      expect(response.signatures[0].label).toEqual('substr(from: number, length?: number): string');
+      expect(response.signatures[0].label)
+          .toEqual('substr(from: number, length?: number | undefined): string');
       expect(response.signatures[0].parameters).not.toBeUndefined();
       expect(response.activeParameter).toBe(1);
 
@@ -206,7 +207,7 @@ describe('Angular Ivy language server', () => {
         const [start, end] = param.label as [number, number];
         return label.substring(start, end);
       });
-      expect(paramLabels).toEqual(['from: number', 'length?: number']);
+      expect(paramLabels).toEqual(['from: number', 'length?: number | undefined']);
     });
   });
 
@@ -480,6 +481,67 @@ describe('Angular Ivy language server', () => {
   })
 });
 
+describe('auto-apply optional chaining', () => {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; /* 10 seconds */
+
+  let client: MessageConnection;
+  beforeEach(async () => {
+    client = createConnection({
+      ivy: true,
+      includeAutomaticOptionalChainCompletions: true,
+    });
+    // If debugging, set to
+    // - lsp.Trace.Messages to inspect request/response/notification, or
+    // - lsp.Trace.Verbose to inspect payload
+    client.trace(lsp.Trace.Off, createTracer());
+    client.listen();
+    await initializeServer(client);
+  });
+
+  afterEach(() => {
+    client.dispose();
+  });
+
+  it('should work on nullable symbol', async () => {
+    openTextDocument(client, FOO_COMPONENT, `
+    import {Component} from '@angular/core';
+    @Component({
+      templateUrl: 'foo.component.html',
+    })
+    export class FooComponent {
+      person?: undefined|{name: string};
+    }
+    `);
+    openTextDocument(client, FOO_TEMPLATE, `{{ person.n }}`);
+    const languageServiceEnabled = await waitForNgcc(client);
+    expect(languageServiceEnabled).toBeTrue();
+    const response = await client.sendRequest(lsp.CompletionRequest.type, {
+      textDocument: {
+        uri: FOO_TEMPLATE_URI,
+      },
+      position: {line: 0, character: 11},
+    }) as lsp.CompletionItem[];
+    const completion = response.find(i => i.label === 'name')!;
+    expect(completion.kind).toEqual(lsp.CompletionItemKind.Property);
+    expect((completion.textEdit as lsp.TextEdit).newText).toEqual('?.name');
+  });
+
+  it('should work on NonNullable symbol', async () => {
+    openTextDocument(client, FOO_TEMPLATE, `{{ title.substr }}`);
+    const languageServiceEnabled = await waitForNgcc(client);
+    expect(languageServiceEnabled).toBeTrue();
+    const response = await client.sendRequest(lsp.CompletionRequest.type, {
+      textDocument: {
+        uri: FOO_TEMPLATE_URI,
+      },
+      position: {line: 0, character: 15},
+    }) as lsp.CompletionItem[];
+    const completion = response.find(i => i.label === 'substr')!;
+    expect(completion.kind).toEqual(lsp.CompletionItemKind.Method);
+    expect((completion.textEdit as lsp.TextEdit).newText).toEqual('substr');
+  });
+});
+
 function onNgccProgress(client: MessageConnection): Promise<string> {
   return new Promise(resolve => {
     client.onProgress(NgccProgressType, NgccProgressToken, (params: NgccProgress) => {

integration/lsp/test_utils.ts

@@ -15,6 +15,7 @@ import {PROJECT_PATH, SERVER_PATH} from '../test_constants';
 
 export interface ServerOptions {
   ivy: boolean;
+  includeAutomaticOptionalChainCompletions?: boolean;
 }
 
 export function createConnection(serverOptions: ServerOptions): MessageConnection {
@@ -28,6 +29,9 @@ export function createConnection(serverOptions: ServerOptions): MessageConnectio
   if (!serverOptions.ivy) {
     argv.push('--viewEngine');
   }
+  if (serverOptions.includeAutomaticOptionalChainCompletions) {
+    argv.push('--includeAutomaticOptionalChainCompletions');
+  }
   const server = fork(SERVER_PATH, argv, {
     cwd: PROJECT_PATH,
     // uncomment to debug server process

integration/lsp/viewengine_spec.ts

@@ -65,7 +65,6 @@ describe('Angular language server', () => {
         },
         newText: 'charAt()',
       },
-      filterText: 'charAt()',
       // The 'data' field is only meaningful in Ivy mode.
       data: jasmine.anything(),
     });

integration/project/tsconfig.json

@@ -3,6 +3,7 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "target": "es2015",
+    "strict": true,
     "typeRoots": [
       "node_modules/@types"
     ]

package.json

@@ -169,7 +169,7 @@
     "test:syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js"
   },
   "dependencies": {
-    "@angular/language-service": "12.1.4",
+    "@angular/language-service": "13.0.0-next.2",
     "typescript": "4.3.4",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageclient": "7.0.0",

server/package.json

@@ -15,7 +15,7 @@
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "12.1.4",
+    "@angular/language-service": "13.0.0-next.2",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.2"

server/src/completion.ts

@@ -104,7 +104,7 @@ function ngCompletionKindToLspCompletionItemKind(kind: CompletionKind): lsp.Comp
  */
 export function tsCompletionEntryToLspCompletionItem(
     entry: ts.CompletionEntry, position: lsp.Position, scriptInfo: ts.server.ScriptInfo,
-    insertReplaceSupport: boolean): lsp.CompletionItem {
+    insertReplaceSupport: boolean, isIvy: boolean): lsp.CompletionItem {
   const item = lsp.CompletionItem.create(entry.name);
   // Even though `entry.kind` is typed as ts.ScriptElementKind, it's
   // really Angular's CompletionKind. This is because ts.ScriptElementKind does
@@ -120,10 +120,12 @@ export function tsCompletionEntryToLspCompletionItem(
   const insertText = entry.insertText || entry.name;
   item.textEdit = createTextEdit(scriptInfo, entry, position, insertText, insertReplaceSupport);
 
-  // If the user enables the config `includeAutomaticOptionalChainCompletions`, the `insertText`
-  // range will include the dot. the `insertText` should be assigned to the `filterText` to filter
-  // the completion items.
-  item.filterText = entry.insertText;
+  if (isIvy) {
+    // If the user enables the config `includeAutomaticOptionalChainCompletions`, the `insertText`
+    // range will include the dot. the `insertText` should be assigned to the `filterText` to filter
+    // the completion items.
+    item.filterText = entry.insertText;
+  }
 
   item.data = {
     kind: 'ngCompletionOriginData',

server/src/session.ts

@@ -1001,7 +1001,7 @@ export class Session {
         false;
     return completions.entries.map(
         (e) => tsCompletionEntryToLspCompletionItem(
-            e, params.position, scriptInfo, clientSupportsInsertReplaceCompletion));
+            e, params.position, scriptInfo, clientSupportsInsertReplaceCompletion, this.ivy));
   }
 
   private onCompletionResolve(item: lsp.CompletionItem): lsp.CompletionItem {

yarn.lock

@@ -19,7 +19,6 @@
 
 "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#5fad38db75f746e76af8b015dd8f674579a54ab3":
   version "0.0.0"
-  uid "5fad38db75f746e76af8b015dd8f674579a54ab3"
   resolved "https://github.com/angular/dev-infra-private-builds.git#5fad38db75f746e76af8b015dd8f674579a54ab3"
   dependencies:
     "@angular/benchpress" "0.2.1"
@@ -53,10 +52,10 @@
     yaml "^1.10.0"
     yargs "^17.0.0"
 
-"@angular/language-service@12.1.4":
-  version "12.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-12.1.4.tgz#4ff59452864147f77996b05cb5a4125895fc0a5d"
-  integrity sha512-NooCGWiTY74DN3uFE8eI1ATtxx4TQzulbV7qNNG9Bz8QJyLRykYart7Ajxh0bF5upR1bjPmHr6MvgO6aI43VUQ==
+"@angular/language-service@13.0.0-next.2":
+  version "13.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-13.0.0-next.2.tgz#4027291ea734195f8518e2ea022c306b9127f49a"
+  integrity sha512-zgzUrpQFzxRH9YFV0Fk21zu7bYpKn5lgeGtUyqgL23fi7BdjuXXyKiB7cnT+xxT4U5yNRlIq4mDQGJRscDvOMg==
 
 "@babel/code-frame@^7.0.0":
   version "7.12.13"