Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix more exceptions, prepare v2.0.2 #3

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ Apply buttons). After this you will find 'Tabdir Project Settings' confi
]]>
</description>

<version>2.0.1</version>
<version>2.0.2</version>
<vendor>Vladimir Rudev, V. Lascik</vendor>
<idea-version since-build="233.13135.103" until-build="400.*"/>
<change-notes><![CDATA[
<ul>
<li>2.0.2 Fix more exceptions</li>
<li>2.0.1 Fix exceptions</li>
<li>2.0.0 Publish a fork under a new name (Tabdir Redux), add regex replacements for tab titles</li>
<li>1.7.0 (mod: vl) Fixup for Idea 233+ (2023.3.2+), add empty path prefixes</li>
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dirname property="basedir" file="${ant.file}"/>

<property file="build.properties"/>
<property name="version" value="2.0.1"/>
<property name="version" value="2.0.2"/>

<!-- If the Idea and JDK on your system are not located at the paths below,
you can specify your paths in build.properties (example in build.properties.example).
Expand Down
21 changes: 8 additions & 13 deletions src/ru/crazycoder/plugins/tabdir/SameFilenameTitleProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,14 @@ public String getEditorTabTitle(@NotNull Project project, @NotNull VirtualFile f
}

public String getEditorTabTitleInternal(final Project project, final VirtualFile file) {
try {
FolderConfiguration matchedConfiguration = findConfiguration(project, file);
if (!needProcessFile(file, matchedConfiguration)) {
return null;
}
if (matchedConfiguration.getRelativeTo() != null && !matchedConfiguration.getRelativeTo().isEmpty()) {
return titleRelativeTo(file, matchedConfiguration);
} else {
return titleWithDiffs(project, file, matchedConfiguration);
}
} catch (Exception e) {
log.error("", e);
throw e;
FolderConfiguration matchedConfiguration = findConfiguration(project, file);
if (!needProcessFile(file, matchedConfiguration)) {
return null;
}
if (matchedConfiguration.getRelativeTo() != null && !matchedConfiguration.getRelativeTo().isEmpty()) {
return titleRelativeTo(file, matchedConfiguration);
} else {
return titleWithDiffs(project, file, matchedConfiguration);
}
}

Expand Down