Skip to content

Commit 0edc8bd

Browse files
muglugmuglug
committed
Simplify getting file_source too
1 parent d43b290 commit 0edc8bd

17 files changed

+37
-37
lines changed

‎src/analyzer/algebra_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub(crate) fn check_for_paradox(
6666
statements_analyzer.get_config(),
6767
&statements_analyzer
6868
.file_analyzer
69-
.get_file_source()
69+
.file_source
7070
.file_path_actual,
7171
);
7272
}

‎src/analyzer/classlike_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'a> ClassLikeAnalyzer<'a> {
8484

8585
let mut analysis_data = FunctionAnalysisData::new(
8686
DataFlowGraph::new(statements_analyzer.get_config().graph_kind),
87-
statements_analyzer.file_analyzer.get_file_source(),
87+
&statements_analyzer.file_analyzer.file_source,
8888
&statements_analyzer.comments,
8989
&statements_analyzer.get_config().all_custom_issues,
9090
None,

‎src/analyzer/dataflow/unused_variable_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ pub(crate) fn add_unused_expression_replacements(
386386
unused_variable_nodes: unused_source_nodes,
387387
comments: statements_analyzer
388388
.file_analyzer
389-
.get_file_source()
389+
.file_source
390390
.comments,
391391
in_single_block: false,
392392
};

‎src/analyzer/expr/assignment/instance_property_assignment_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ pub(crate) fn analyze_atomic_assignment(
552552
file_path: Some(
553553
&statements_analyzer
554554
.file_analyzer
555-
.get_file_source()
555+
.file_source
556556
.file_path,
557557
),
558558
..Default::default()

‎src/analyzer/expr/assignment/static_property_assignment_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ pub(crate) fn analyze(
185185
file_path: Some(
186186
&statements_analyzer
187187
.file_analyzer
188-
.get_file_source()
188+
.file_source
189189
.file_path,
190190
),
191191
..Default::default()

‎src/analyzer/expr/call/arguments_analyzer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ pub(crate) fn check_arguments_match(
113113
file_path: Some(
114114
&statements_analyzer
115115
.file_analyzer
116-
.get_file_source()
116+
.file_source
117117
.file_path,
118118
),
119119
expand_typenames: false,
@@ -751,7 +751,7 @@ fn get_param_type(
751751
file_path: Some(
752752
&statements_analyzer
753753
.file_analyzer
754-
.get_file_source()
754+
.file_source
755755
.file_path,
756756
),
757757
..Default::default()
@@ -1112,7 +1112,7 @@ fn handle_possibly_matching_inout_param(
11121112
file_path: Some(
11131113
&statements_analyzer
11141114
.file_analyzer
1115-
.get_file_source()
1115+
.file_source
11161116
.file_path,
11171117
),
11181118
..Default::default()

‎src/analyzer/expr/call/existing_atomic_method_call_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ fn handle_defined_shape_idx(
634634
statements_analyzer.get_config(),
635635
&statements_analyzer
636636
.file_analyzer
637-
.get_file_source()
637+
.file_source
638638
.file_path_actual,
639639
);
640640
}

‎src/analyzer/expr/call/function_call_return_type_fetcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub(crate) fn fetch(
128128
file_path: Some(
129129
&statements_analyzer
130130
.file_analyzer
131-
.get_file_source()
131+
.file_source
132132
.file_path,
133133
),
134134
..Default::default()

‎src/analyzer/expr/call/method_call_return_type_fetcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub(crate) fn fetch(
129129
file_path: Some(
130130
&statements_analyzer
131131
.file_analyzer
132-
.get_file_source()
132+
.file_source
133133
.file_path,
134134
),
135135
..Default::default()

‎src/analyzer/expr/call/new_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ fn analyze_named_constructor(
482482
file_path: Some(
483483
&statements_analyzer
484484
.file_analyzer
485-
.get_file_source()
485+
.file_source
486486
.file_path,
487487
),
488488
..Default::default()
@@ -600,7 +600,7 @@ fn analyze_named_constructor(
600600
file_path: Some(
601601
&statements_analyzer
602602
.file_analyzer
603-
.get_file_source()
603+
.file_source
604604
.file_path,
605605
),
606606
..Default::default()

‎src/analyzer/expr/fetch/atomic_property_fetch_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ fn get_class_property_type(
234234
file_path: Some(
235235
&statements_analyzer
236236
.file_analyzer
237-
.get_file_source()
237+
.file_source
238238
.file_path,
239239
),
240240
..Default::default()
@@ -334,7 +334,7 @@ fn update_template_types(
334334
file_path: Some(
335335
&statements_analyzer
336336
.file_analyzer
337-
.get_file_source()
337+
.file_source
338338
.file_path,
339339
),
340340
..Default::default()

‎src/analyzer/expr/fetch/class_constant_fetch_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ fn analyse_known_class_constant(
291291
file_path: Some(
292292
&statements_analyzer
293293
.file_analyzer
294-
.get_file_source()
294+
.file_source
295295
.file_path,
296296
),
297297
..Default::default()

‎src/analyzer/expr/fetch/static_property_fetch_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ pub(crate) fn analyze(
240240
file_path: Some(
241241
&statements_analyzer
242242
.file_analyzer
243-
.get_file_source()
243+
.file_source
244244
.file_path,
245245
),
246246
..Default::default()

‎src/analyzer/file_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct InternalError(pub String, pub HPos);
2020

2121
#[derive(Clone)]
2222
pub struct FileAnalyzer<'a> {
23-
file_source: FileSource<'a>,
23+
pub file_source: FileSource<'a>,
2424
namespace_name: Option<String>,
2525
pub resolved_names: &'a FxHashMap<u32, StrId>,
2626
pub codebase: &'a CodebaseInfo,
@@ -113,7 +113,7 @@ impl<'a> FileAnalyzer<'a> {
113113
analysis_result,
114114
&statements_analyzer
115115
.file_analyzer
116-
.get_file_source()
116+
.file_source
117117
.file_path,
118118
false,
119119
);

‎src/analyzer/functionlike_analyzer.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
6767
"Cannot resolve function name".to_string(),
6868
HPos::new(
6969
stmt.name.pos(),
70-
self.file_analyzer.get_file_source().file_path,
70+
self.file_analyzer.file_source.file_path,
7171
),
7272
));
7373
};
@@ -90,7 +90,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
9090
"Cannot load function storage".to_string(),
9191
HPos::new(
9292
stmt.name.pos(),
93-
self.file_analyzer.get_file_source().file_path,
93+
self.file_analyzer.file_source.file_path,
9494
),
9595
));
9696
};
@@ -99,7 +99,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
9999
self.file_analyzer,
100100
function_storage.type_resolution_context.as_ref().unwrap(),
101101
self.file_analyzer
102-
.get_file_source()
102+
.file_source
103103
.comments
104104
.iter()
105105
.filter(|c| {
@@ -148,7 +148,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
148148
None => {
149149
return Err(AnalysisError::InternalError(
150150
"Cannot get closure storage".to_string(),
151-
HPos::new(&stmt.span, self.file_analyzer.get_file_source().file_path),
151+
HPos::new(&stmt.span, self.file_analyzer.file_source.file_path),
152152
));
153153
}
154154
Some(value) => value,
@@ -164,7 +164,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
164164
self.file_analyzer,
165165
lambda_storage.type_resolution_context.as_ref().unwrap(),
166166
self.file_analyzer
167-
.get_file_source()
167+
.file_source
168168
.comments
169169
.iter()
170170
.filter(|c| {
@@ -218,7 +218,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
218218
} else {
219219
return Err(AnalysisError::InternalError(
220220
"Cannot resolve method name".to_string(),
221-
HPos::new(&stmt.name.0, self.file_analyzer.get_file_source().file_path),
221+
HPos::new(&stmt.name.0, self.file_analyzer.file_source.file_path),
222222
));
223223
};
224224

@@ -240,7 +240,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
240240
} else {
241241
return Err(AnalysisError::InternalError(
242242
"Cannot resolve function storage".to_string(),
243-
HPos::new(&stmt.name.0, self.file_analyzer.get_file_source().file_path),
243+
HPos::new(&stmt.name.0, self.file_analyzer.file_source.file_path),
244244
));
245245
};
246246

@@ -251,7 +251,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
251251
.as_ref()
252252
.unwrap(),
253253
self.file_analyzer
254-
.get_file_source()
254+
.file_source
255255
.comments
256256
.iter()
257257
.filter(|c| {
@@ -409,7 +409,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
409409
false
410410
},
411411
expand_generic: true,
412-
file_path: Some(&self.file_analyzer.get_file_source().file_path),
412+
file_path: Some(&self.file_analyzer.file_source.file_path),
413413

414414
..Default::default()
415415
},
@@ -456,7 +456,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
456456

457457
let mut analysis_data = FunctionAnalysisData::new(
458458
DataFlowGraph::new(statements_analyzer.get_config().graph_kind),
459-
statements_analyzer.file_analyzer.get_file_source(),
459+
&statements_analyzer.file_analyzer.file_source,
460460
&statements_analyzer.comments,
461461
&self.get_config().all_custom_issues,
462462
if let Some(parent_analysis_data) = &parent_analysis_data {
@@ -899,7 +899,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
899899
analysis_result,
900900
&statements_analyzer
901901
.file_analyzer
902-
.get_file_source()
902+
.file_source
903903
.file_path,
904904
functionlike_storage.ignore_taint_path,
905905
);
@@ -1053,7 +1053,7 @@ impl<'a> FunctionLikeAnalyzer<'a> {
10531053
if let GraphKind::WholeProgram(_) = &analysis_data.data_flow_graph.kind {
10541054
let calling_id = if let Some(calling_closure_id) = context.calling_closure_id {
10551055
FunctionLikeIdentifier::Closure(
1056-
self.file_analyzer.get_file_source().file_path,
1056+
self.file_analyzer.file_source.file_path,
10571057
calling_closure_id,
10581058
)
10591059
} else {
@@ -1544,7 +1544,7 @@ pub(crate) fn get_closure_storage(
15441544
.codebase
15451545
.functionlike_infos
15461546
.get(&(
1547-
file_analyzer.get_file_source().file_path.0,
1547+
file_analyzer.file_source.file_path.0,
15481548
StrId(offset as u32),
15491549
))
15501550
.cloned()

‎src/analyzer/statements_analyzer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl<'a> StatementsAnalyzer<'a> {
112112

113113
#[inline]
114114
pub fn get_hpos(&self, pos: &Pos) -> HPos {
115-
HPos::new(pos, self.file_analyzer.get_file_source().file_path)
115+
HPos::new(pos, self.file_analyzer.file_source.file_path)
116116
}
117117

118118
#[inline]
@@ -122,7 +122,7 @@ impl<'a> StatementsAnalyzer<'a> {
122122
calling_functionlike_id: Option<&'a FunctionLikeIdentifier>,
123123
) -> AssertionContext {
124124
AssertionContext {
125-
file_source: self.file_analyzer.get_file_source(),
125+
file_source: &self.file_analyzer.file_source,
126126
resolved_names: self.file_analyzer.resolved_names,
127127
codebase: Some((self.codebase, self.interner)),
128128
this_class_name,
@@ -144,11 +144,11 @@ impl<'a> StatementsAnalyzer<'a> {
144144
}
145145

146146
pub fn get_file_path(&self) -> &FilePath {
147-
&self.file_analyzer.get_file_source().file_path
147+
&self.file_analyzer.file_source.file_path
148148
}
149149

150150
pub fn get_file_path_actual(&self) -> &str {
151-
&self.file_analyzer.get_file_source().file_path_actual
151+
&self.file_analyzer.file_source.file_path_actual
152152
}
153153
}
154154

‎src/analyzer/stmt/return_analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pub(crate) fn analyze(
166166
file_path: Some(
167167
&statements_analyzer
168168
.file_analyzer
169-
.get_file_source()
169+
.file_source
170170
.file_path,
171171
),
172172
..Default::default()

0 commit comments

Comments
 (0)