Skip to content

fix(language-server): recover project for external templates in solution-style workspaces #69769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShayanAbbas1 wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −1
Open

fix(language-server): recover project for external templates in solution-style workspaces #69769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion vscode-ng-language-service/server/src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,37 @@ export class Session {
// If they are already part of a ConfiguredProject then the following is
// not needed.
if (!project || project.projectKind !== ts.server.ProjectKind.Configured) {
const {configFileName} = this.projectService.openClientFile(scriptInfo.fileName);
let {configFileName} = this.projectService.openClientFile(scriptInfo.fileName);
if (configFileName === undefined && isExternalTemplate(scriptInfo.fileName)) {
// In a composite/solution-style project with references, TypeScript cannot resolve a
// config file for an HTML file because HTML files are unlikely to be listed in any
// files/includes list. When an external template loses its configured project after it
// was opened (e.g. because the corresponding component file was closed and the project
// graph was updated), the same best-effort used in `onDidOpenTextDocument` is needed
// here: briefly open the sibling TS file (most of the time the component of this
// template) to load its project, then retry.
// https://github.com/angular/vscode-ng-language-service/issues/2149
const maybeComponentTsPath = scriptInfo.fileName.replace(/\.html$/, '.ts');
if (!this.projectService.openFiles.has(this.projectService.toPath(maybeComponentTsPath))) {
this.projectService.openClientFile(maybeComponentTsPath);
this.projectService.closeClientFile(maybeComponentTsPath);
({configFileName} = this.projectService.openClientFile(scriptInfo.fileName));
}
if (configFileName === undefined) {
// `openClientFile` does not repeat the config lookup for a file that is already open,
// so it can still report no config file even though the component's project is now
// loaded. Fall back to attaching the template directly to the configured project of
// its component.
const componentProject = this.projectService
.getScriptInfo(maybeComponentTsPath)
?.containingProjects.find(isConfiguredProject);
if (componentProject) {
scriptInfo.detachAllProjects();
scriptInfo.attachToProject(componentProject);
return componentProject;
}
}
}
if (!configFileName) {
// Failed to find a config file. There is nothing we could do.
this.error(`No config file for ${scriptInfo.fileName}`);
Expand Down
Loading