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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-06-13 15:48:36 +03:00
parent f8c4828d5a
commit 7ed3424a0b
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
+3 -11
View File
@@ -228,15 +228,8 @@ public final class LoadTextUtil {
@NotNull
private static Charset getDefaultCharsetFromEncodingManager(@NotNull VirtualFile virtualFile) {
Charset result = null;
Charset specifiedExplicitly = EncodingRegistry.getInstance().getEncoding(virtualFile, true);
if (specifiedExplicitly != null) {
result = specifiedExplicitly;
}
if (result == null) {
result = EncodingRegistry.getInstance().getDefaultCharset();
}
return result;
return ObjectUtils.notNull(specifiedExplicitly, EncodingRegistry.getInstance().getDefaultCharset());
}
@NotNull
@@ -677,9 +670,8 @@ public final class LoadTextUtil {
return virtualFile.getUserData(CHARSET_WAS_DETECTED_FROM_BYTES);
}
private static void setCharsetAutoDetectionReason(
@NotNull VirtualFile virtualFile,
@Nullable("null if was not detected, otherwise the reason it was") AutoDetectionReason reason) {
private static void setCharsetAutoDetectionReason(@NotNull VirtualFile virtualFile,
@Nullable("null if was not detected, otherwise the reason it was") AutoDetectionReason reason) {
virtualFile.putUserData(CHARSET_WAS_DETECTED_FROM_BYTES, reason);
}
platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
+5 -7
View File
@@ -100,13 +100,11 @@ public class UsageViewUtil {
Set<UsageInfo> set = new LinkedHashSet<>(Arrays.asList(usages));
// Replace duplicates of move rename usage infos in injections from non code usages of master files
String newTextInNonCodeUsage = null;
for(UsageInfo usage:usages) {
if (!(usage instanceof NonCodeUsageInfo)) continue;
newTextInNonCodeUsage = ((NonCodeUsageInfo)usage).newText;
break;
}
String newTextInNonCodeUsage =
Arrays.stream(usages)
.filter(usage -> usage instanceof NonCodeUsageInfo)
.map(usage -> ((NonCodeUsageInfo)usage).newText)
.findFirst().orElse(null);
if (newTextInNonCodeUsage != null) {
for(UsageInfo usage:usages) {