@@ -119,30 +119,13 @@ function constructArgs(ctx: vscode.ExtensionContext, debug: boolean): string[] {
119
119
args . push ( '--logVerbosity' , debug ? 'verbose' : ngLog ) ;
120
120
}
121
121
122
- // Due to a bug in tsserver, ngProbeLocation is not honored when tsserver
123
- // loads the plugin. tsserver would look for @angular /language-service in its
124
- // peer node_modules directory, and use that if it finds one. To work around
125
- // this bug, always load typescript from the bundled location for now, so that
126
- // the bundled @angular /language-service is always chosen.
127
- // See the following links:
128
- // 1. https://github.com/angular/vscode-ng-language-service/issues/437
129
- // 2. https://github.com/microsoft/TypeScript/issues/34616
130
- // 3. https://github.com/microsoft/TypeScript/pull/34656
131
- // TODO: Remove workaround once
132
- // https://github.com/microsoft/TypeScript/commit/f689982c9f2081bc90d2192eee96b404f75c4705
133
- // is released and Angular is switched over to the new TypeScript version.
134
- args . push ( '--ngProbeLocations' , ctx . asAbsolutePath ( 'server' ) ) ;
135
- args . push ( '--tsProbeLocations' , ctx . extensionPath ) ;
136
-
137
- /*
138
122
const ngdk : string | null = config . get ( 'angular.ngdk' , null ) ;
139
123
const ngProbeLocations = getProbeLocations ( ngdk , ctx . asAbsolutePath ( 'server' ) ) ;
140
124
args . push ( '--ngProbeLocations' , ngProbeLocations . join ( ',' ) ) ;
141
125
142
126
const tsdk : string | null = config . get ( 'typescript.tsdk' , null ) ;
143
127
const tsProbeLocations = getProbeLocations ( tsdk , ctx . extensionPath ) ;
144
128
args . push ( '--tsProbeLocations' , tsProbeLocations . join ( ',' ) ) ;
145
- */
146
129
147
130
return args ;
148
131
}
0 commit comments