|
31 | 31 | import org.springframework.boot.test.context.SpringBootTest; |
32 | 32 | import org.springframework.test.annotation.DirtiesContext; |
33 | 33 |
|
| 34 | +import java.nio.file.Paths; |
| 35 | + |
34 | 36 | import static com.github._1c_syntax.bsl.languageserver.util.TestUtils.PATH_TO_METADATA; |
35 | 37 | import static org.assertj.core.api.Assertions.assertThat; |
36 | 38 |
|
@@ -64,31 +66,35 @@ void getSymbols() { |
64 | 66 | .hasSizeGreaterThan(0) |
65 | 67 | .anyMatch(symbolInformation -> |
66 | 68 | symbolInformation.getName().equals("НеУстаревшаяПроцедура") |
67 | | - && symbolInformation.getLocation().getUri().contains("ПервыйОбщийМодуль") |
| 69 | + && uriContains(symbolInformation, "ПервыйОбщийМодуль") |
68 | 70 | && symbolInformation.getKind() == SymbolKind.Method |
69 | 71 | && !symbolInformation.getDeprecated() |
70 | 72 | ) |
71 | 73 | .anyMatch(symbolInformation -> |
72 | 74 | symbolInformation.getName().equals("НеУстаревшаяПроцедура") |
73 | | - && symbolInformation.getLocation().getUri().contains("РегистрСведений1") |
| 75 | + && uriContains(symbolInformation, "РегистрСведений1") |
74 | 76 | && symbolInformation.getKind() == SymbolKind.Method |
75 | 77 | && !symbolInformation.getDeprecated() |
76 | 78 | ) |
77 | 79 | .anyMatch(symbolInformation -> |
78 | 80 | symbolInformation.getName().equals("УстаревшаяПроцедура") |
79 | | - && symbolInformation.getLocation().getUri().contains("ПервыйОбщийМодуль") |
| 81 | + && uriContains(symbolInformation, "ПервыйОбщийМодуль") |
80 | 82 | && symbolInformation.getKind() == SymbolKind.Method |
81 | 83 | && symbolInformation.getDeprecated() |
82 | 84 | ) |
83 | 85 | .anyMatch(symbolInformation -> |
84 | 86 | symbolInformation.getName().equals("ВалютаУчета") |
85 | | - && symbolInformation.getLocation().getUri().contains("ManagedApplicationModule") |
| 87 | + && uriContains(symbolInformation, "ManagedApplicationModule") |
86 | 88 | && symbolInformation.getKind() == SymbolKind.Variable |
87 | 89 | && !symbolInformation.getDeprecated() |
88 | 90 | ) |
89 | 91 | ; |
90 | 92 | } |
91 | 93 |
|
| 94 | + private boolean uriContains(org.eclipse.lsp4j.SymbolInformation symbolInformation, String name) { |
| 95 | + return Paths.get(Absolute.uri(symbolInformation.getLocation().getUri())).toString().contains(name); |
| 96 | + } |
| 97 | + |
92 | 98 | @Test |
93 | 99 | void getSymbolsQueryString() { |
94 | 100 |
|
@@ -134,7 +140,6 @@ void getSymbolsQueryStringErrorRegex() { |
134 | 140 |
|
135 | 141 | // then |
136 | 142 | assertThat(symbols).isEmpty(); |
137 | | - ; |
138 | 143 | } |
139 | 144 |
|
140 | 145 |
|
|
0 commit comments