From ec513529e6f8ea009cc2afd2d883d4a9db9729cf Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Mon, 27 Jun 2016 19:02:48 +0300 Subject: [PATCH] on IDEA-CR-11779: don't use HIDE_KNOWN_EXTENSION_IN_TABS in UniqueVFilePathBuilderImpl virtualFile.getPresentableName() uses HIDE_KNOWN_EXTENSION_IN_TABS, but getName() doesn't --- .../fileEditor/impl/UniqueNameEditorTabTitleProvider.java | 4 ++-- .../openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueNameEditorTabTitleProvider.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueNameEditorTabTitleProvider.java index 30096d3a2b34..40e739648dba 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueNameEditorTabTitleProvider.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueNameEditorTabTitleProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -42,7 +42,7 @@ public class UniqueNameEditorTabTitleProvider implements EditorTabTitleProvider return uniqueName.equals(file.getName()) ? null : uniqueName; } - public static String getEditorTabText(String result, String separator, boolean hideKnownExtensionInTabs) { + public static String getEditorTabText(String result, String separator, boolean hideKnownExtensionInTabs) { if (hideKnownExtensionInTabs) { String withoutExtension = FileUtil.getNameWithoutExtension(result); if (StringUtil.isNotEmpty(withoutExtension) && !withoutExtension.endsWith(separator)) { diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java index 5e84157f8631..3f47134bd7cb 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -100,7 +100,7 @@ public class UniqueVFilePathBuilderImpl extends UniqueVFilePathBuilder { } return uniqueNameBuilderForShortName.getShortPath(file); } - return file.getPresentableName(); + return file.getName(); } @Nullable