File tree 3 files changed +15
-6
lines changed
3 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ impl Display for ResolvedName {
56
56
fn fmt ( & self , f : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
57
57
match self {
58
58
ResolvedName :: Remote ( name) => write ! ( f, "<remote>/{}" , name) ,
59
- ResolvedName :: Project ( name) => write ! ( f, "<project>/ {}" , name) ,
59
+ ResolvedName :: Project ( name) => write ! ( f, "{}" , name) ,
60
60
}
61
61
}
62
62
}
Original file line number Diff line number Diff line change @@ -23,7 +23,18 @@ pub fn resolve_call_expr(
23
23
. at ( source) ) ;
24
24
}
25
25
26
- let resolved_name = ResolvedName :: Project ( call. function_name . basename . clone ( ) . into_boxed_str ( ) ) ;
26
+ eprintln ! ( "warning: function call name resolution not fully implemented yet" ) ;
27
+ let resolved_name = if !call. function_name . namespace . is_empty ( ) {
28
+ ResolvedName :: Project (
29
+ format ! (
30
+ "{}{}" ,
31
+ call. function_name. namespace, call. function_name. basename
32
+ )
33
+ . into_boxed_str ( ) ,
34
+ )
35
+ } else {
36
+ ResolvedName :: Project ( call. function_name . basename . clone ( ) . into_boxed_str ( ) )
37
+ } ;
27
38
28
39
let Some ( function_ref) = ctx. function_search_ctx . find_function ( & resolved_name) else {
29
40
return Err ( ResolveErrorKind :: FailedToFindFunction {
Original file line number Diff line number Diff line change @@ -252,7 +252,7 @@ pub fn resolve<'a>(
252
252
} ;
253
253
254
254
let function_ref = resolved_ast. functions . insert ( resolved:: Function {
255
- name,
255
+ name : name . clone ( ) ,
256
256
parameters : resolve_parameters (
257
257
type_search_ctx,
258
258
source_files,
@@ -285,11 +285,9 @@ pub fn resolve<'a>(
285
285
. function_search_ctxs
286
286
. get_or_insert_with ( file_id, || FunctionSearchCtx :: new ( ) ) ;
287
287
288
- let resolved_name = ResolvedName :: Project ( function. name . clone ( ) . into_boxed_str ( ) ) ;
289
-
290
288
function_search_context
291
289
. available
292
- . entry ( resolved_name )
290
+ . entry ( name )
293
291
. or_insert_with ( || vec ! [ function_ref] ) ;
294
292
}
295
293
}
You can’t perform that action at this time.
0 commit comments