MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

properties: cache default base name (IDEA-178385)

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-09-01 18:56:47 +03:00
parent abe0e4facc
commit 3a2a54275f
2 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java
+35 -22
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.reference.SoftLazyValue;
import com.intellij.util.Function;
import com.intellij.util.SmartList;
@@ -98,32 +101,42 @@ public class PropertiesUtil {
}
@NotNull
static String getDefaultBaseName(@NotNull final VirtualFile file) {
final String name = file.getName();
static String getDefaultBaseName(@NotNull final PsiFile file) {
return CachedValuesManager.getCachedValue(file, new CachedValueProvider<String>() {
@NotNull
@Override
public Result<String> compute() {
return Result.create(computeBaseName(), file);
}
if (!StringUtil.containsChar(name, '_')) {
return FileUtil.getNameWithoutExtension(name);
}
private String computeBaseName() {
final String name = file.getName();
final Matcher matcher = LOCALE_PATTERN.matcher(name);
final String baseNameWithExtension;
int matchIndex = 0;
while (matcher.find(matchIndex)) {
final MatchResult matchResult = matcher.toMatchResult();
final String[] splitted = matchResult.group(1).split("_");
if (splitted.length > 1) {
final String langCode = splitted[1];
if (!LOCALES_LANGUAGE_CODES.getValue().contains(langCode)) {
matchIndex = matchResult.start(1) + 1;
continue;
if (!StringUtil.containsChar(name, '_')) {
return FileUtil.getNameWithoutExtension(name);
}
baseNameWithExtension = name.substring(0, matchResult.start(1)) + name.substring(matchResult.end(1));
final Matcher matcher = LOCALE_PATTERN.matcher(name);
final String baseNameWithExtension;
int matchIndex = 0;
while (matcher.find(matchIndex)) {
final MatchResult matchResult = matcher.toMatchResult();
final String[] splitted = matchResult.group(1).split("_");
if (splitted.length > 1) {
final String langCode = splitted[1];
if (!LOCALES_LANGUAGE_CODES.getValue().contains(langCode)) {
matchIndex = matchResult.start(1) + 1;
continue;
}
baseNameWithExtension = name.substring(0, matchResult.start(1)) + name.substring(matchResult.end(1));
return FileUtil.getNameWithoutExtension(baseNameWithExtension);
}
}
baseNameWithExtension = name;
return FileUtil.getNameWithoutExtension(baseNameWithExtension);
}
}
baseNameWithExtension = name;
return FileUtil.getNameWithoutExtension(baseNameWithExtension);
});
}
@NotNull
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java
+5 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -197,17 +197,13 @@ public class ResourceBundleManager implements PersistentStateComponent<ResourceB
@NotNull
public String getBaseName(@NotNull final PsiFile file) {
return getBaseName(file.getVirtualFile());
}
@NotNull
private String getBaseName(@NotNull final VirtualFile file) {
final CustomResourceBundleState customResourceBundle = getCustomResourceBundleState(file);
final VirtualFile vFile = file.getVirtualFile();
final CustomResourceBundleState customResourceBundle = getCustomResourceBundleState(vFile);
if (customResourceBundle != null) {
return customResourceBundle.getBaseName();
}
if (isDefaultDissociated(file)) {
return file.getNameWithoutExtension();
if (isDefaultDissociated(vFile)) {
return vFile.getNameWithoutExtension();
}
return PropertiesUtil.getDefaultBaseName(file);
}