Skip to content

Fix change separator action #182

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 15, 2020
Merged

Fix change separator action #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07c11e7
[INTERNAL] graceful handling of non-language file-type
SeeSharpSoft Feb 15, 2020
7e5a106
[INTERNAL] fix selection indicator for default separator action
SeeSharpSoft Feb 15, 2020
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: 1 addition & 2 deletions src/main/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvDefaultSeparatorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) {
if (psiFile == null) {
return false;
}
return CsvHelper.getValueSeparator(psiFile) == null;
return !CsvHelper.hasValueSeparatorAttribute(psiFile);
}

@Override
Expand All @@ -31,7 +31,6 @@ public void setSelected(@NotNull AnActionEvent anActionEvent, boolean selected)
if (psiFile == null) {
return;
}

CsvFileAttributes.getInstance(psiFile.getProject()).resetValueSeparator(psiFile);
FileContentUtilCore.reparseFiles(psiFile.getVirtualFile());

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,9 @@ public void resetValueSeparator(@NotNull PsiFile psiFile) {

public @NotNull
CsvValueSeparator getValueSeparator(Project project, VirtualFile virtualFile) {
if (project == null || virtualFile == null) {
if (project == null || virtualFile == null || !(virtualFile.getFileType() instanceof LanguageFileType)) {
return CsvEditorSettings.getInstance().getDefaultValueSeparator();
}
assert(virtualFile.getFileType() instanceof LanguageFileType);
Language language = ((LanguageFileType) virtualFile.getFileType()).getLanguage();
if (language instanceof CsvSeparatorHolder) {
return ((CsvSeparatorHolder) language).getSeparator();
Expand Down