fixes after merge

Author: bartlomieju

internal/api/server.go

@@ -290,7 +290,7 @@ func (r *resolverWrapper) GetPackageScopeForPath(directory string) *packagejson.
 }
 
 // ResolveModuleName implements module.ResolverInterface.
-func (r *resolverWrapper) ResolveModuleName(moduleName string, containingFile string, importAttributeType *string, resolutionMode core.ResolutionMode, redirectedReference module.ResolvedProjectReference) (*module.ResolvedModule, []string) {
+func (r *resolverWrapper) ResolveModuleName(moduleName string, containingFile string, importAttributeType *string, resolutionMode core.ResolutionMode, redirectedReference module.ResolvedProjectReference) (*module.ResolvedModule, []DiagAndArgs) {
 	if r.server.CallbackEnabled(CallbackResolveModuleName) {
 		result, err := r.server.call("resolveModuleName", map[string]any{
 			"moduleName":          moduleName,
@@ -314,7 +314,7 @@ func (r *resolverWrapper) ResolveModuleName(moduleName string, containingFile st
 }
 
 // ResolveTypeReferenceDirective implements module.ResolverInterface.
-func (r *resolverWrapper) ResolveTypeReferenceDirective(typeReferenceDirectiveName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference module.ResolvedProjectReference) (*module.ResolvedTypeReferenceDirective, []string) {
+func (r *resolverWrapper) ResolveTypeReferenceDirective(typeReferenceDirectiveName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference module.ResolvedProjectReference) (*module.ResolvedTypeReferenceDirective, []DiagAndArgs) {
 	if r.server.CallbackEnabled(CallbackResolveTypeReferenceDirective) {
 		result, err := r.server.call("resolveTypeReferenceDirective", map[string]any{
 			"typeReferenceDirectiveName": typeReferenceDirectiveName,

internal/module/resolver.go

@@ -148,8 +148,8 @@ func GetCompilerOptionsWithRedirect(compilerOptions *core.CompilerOptions, redir
 }
 
 type ResolverInterface interface {
-	ResolveModuleName(moduleName string, containingFile string, kind *string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedModule, []string)
-	ResolveTypeReferenceDirective(typeReferenceDirectiveName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedTypeReferenceDirective, []string)
+	ResolveModuleName(moduleName string, containingFile string, importAttributeType *string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedModule, []DiagAndArgs)
+	ResolveTypeReferenceDirective(typeReferenceDirectiveName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedTypeReferenceDirective, []DiagAndArgs)
 	GetPackageJsonScopeIfApplicable(path string) *packagejson.InfoCacheEntry
 	GetPackageScopeForPath(directory string) *packagejson.InfoCacheEntry
 	GetImpliedNodeFormatForFile(path string, packageJsonType string) core.ModuleKind
@@ -237,7 +237,7 @@ func (r *Resolver) ResolveTypeReferenceDirective(
 	return result, traceBuilder.getTraces()
 }
 
-func (r *Resolver) ResolveModuleName(moduleName string, containingFile string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedModule, []DiagAndArgs) {
+func (r *Resolver) ResolveModuleName(moduleName string, containingFile string, importAttributeType *string, resolutionMode core.ResolutionMode, redirectedReference ResolvedProjectReference) (*ResolvedModule, []DiagAndArgs) {
 	traceBuilder := r.newTraceBuilder()
 	compilerOptions := GetCompilerOptionsWithRedirect(r.compilerOptions, redirectedReference)
 	if traceBuilder != nil {