Skip to content

Commit 9bd3a64

Browse files
committed
swap translation implementation to its right scope
1 parent b6cb7d3 commit 9bd3a64

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/provider/CompiledTranslatorProvider.java

+3-12
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,13 @@
3131
public class CompiledTranslatorProvider implements TranslatorProvider {
3232
@Override
3333
public boolean hasTranslationKey(@NotNull Project project, @NotNull String keyName, @NotNull String domainName) {
34-
for(Set<String> keys: FileBasedIndex.getInstance().getValues(TranslationStubIndex.KEY, domainName, GlobalSearchScope.allScope(project))){
35-
if(keys.contains(keyName)) {
36-
return true;
37-
}
38-
}
39-
40-
return false;
34+
Set<String> domainMap = TranslationIndex.getInstance(project).getTranslationMap().getDomainMap(domainName);
35+
return domainMap != null && domainMap.contains(keyName);
4136
}
4237

4338
@Override
4439
public boolean hasDomain(@NotNull Project project, @NotNull String domainName) {
45-
return FileBasedIndex.getInstance().getValues(
46-
TranslationStubIndex.KEY,
47-
domainName,
48-
GlobalSearchScope.allScope(project)
49-
).size() > 0;
40+
return TranslationIndex.getInstance(project).getTranslationMap().getDomainList().contains(domainName);
5041
}
5142

5243
@NotNull

src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/provider/IndexTranslatorProvider.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,22 @@
3131
public class IndexTranslatorProvider implements TranslatorProvider {
3232
@Override
3333
public boolean hasTranslationKey(@NotNull Project project, @NotNull String keyName, @NotNull String domainName) {
34-
Set<String> domainMap = TranslationIndex.getInstance(project).getTranslationMap().getDomainMap(domainName);
35-
return domainMap != null && domainMap.contains(keyName);
34+
for(Set<String> keys: FileBasedIndex.getInstance().getValues(TranslationStubIndex.KEY, domainName, GlobalSearchScope.allScope(project))){
35+
if(keys.contains(keyName)) {
36+
return true;
37+
}
38+
}
39+
40+
return false;
3641
}
3742

3843
@Override
3944
public boolean hasDomain(@NotNull Project project, @NotNull String domainName) {
40-
return TranslationIndex.getInstance(project).getTranslationMap().getDomainList().contains(domainName);
45+
return FileBasedIndex.getInstance().getValues(
46+
TranslationStubIndex.KEY,
47+
domainName,
48+
GlobalSearchScope.allScope(project)
49+
).size() > 0;
4150
}
4251

4352
@NotNull

0 commit comments

Comments
 (0)