Skip to content

Commit 0b8eeb8

Browse files
SeeSharpSoftSeeSharpSoft
committed
[NEW] default "Header row fixed" setting
Fix "Value Coloring" not applied to open files
1 parent e787aa8 commit 0b8eeb8

File tree

9 files changed

+57
-13
lines changed

9 files changed

+57
-13
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
2.14.3
2-
Oct ??, 2020
2+
Oct 10, 2020
33

4+
NEW: Added default "Header row fixed" setting (enabled)
45
NEW: Support "Comment with line comment" #247
6+
FIX: "Value coloring" change not applied to open files
57

68
2.14.2
79
Sep 17, 2020

‎README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This enables default editor features like syntax validation, highlighting and in
2020
- flexible Table Editor
2121
- customizable text editor
2222
- customizable column coloring
23+
- customizable line comment
2324
- syntax validation
2425
- syntax highlighting (customizable)
2526
- content formatting (customizable)
@@ -145,11 +146,11 @@ _Default Escape Character_ defines which escape character is used as standard fo
145146

146147
Define the character(s) that should be used to mark a line as a comment within a CSV document.
147148

148-
Please note:
149+
**Please note:**
149150

150151
- If not set, comments are disabled, which also will increase lexer/parser performance on large files.
151152
- If a line starts with those characters (leading whitespaces are ignored), the whole line isn't considered data and skipped e.g. for formatting, structure view and the table editor.
152-
- Files containing comments can't be edited but still viewed via the **Table Editor** (without showing the comments).
153+
- Files containing comments **can't be edited** - but still viewed - via the **Table Editor** (without showing the comments)!
153154

154155
##### Column numbering
155156

@@ -210,6 +211,10 @@ The maximum width of a single table column in _px_, which is used when adjusting
210211

211212
If selected, the table column widths are adjusted based on the column contents automatically when the table editor is opened. This setting can be changed in the table editor itself per file.
212213

214+
##### Header row fixed (default)
215+
216+
If selected, the first record of CSV files will be considered the header per default, which affects the column names in the table editor. This setting can be changed in the table editor itself per file.
217+
213218
##### Keep/ignore linebreak at file end
214219

215220
If the file ends with a completely empty line (no spaces or tabs either), the table editor will not show this line as empty values but ignore it. When table data is serialized, an existing empty line is kept at the end of the file.

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorState.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,15 @@ public void setColumnWidths(int[] widths) {
3333
}
3434

3535
public boolean showInfoPanel() {
36-
if (showInfoPanel == null) {
37-
return CsvEditorSettings.getInstance().showTableEditorInfoPanel();
38-
}
39-
return showInfoPanel;
36+
return showInfoPanel == null ? CsvEditorSettings.getInstance().showTableEditorInfoPanel() : showInfoPanel;
4037
}
4138

4239
public void setShowInfoPanel(boolean showInfoPanelArg) {
4340
showInfoPanel = showInfoPanelArg;
4441
}
4542

4643
public boolean getFixedHeaders() {
47-
return fixedHeaders == null ? false : fixedHeaders;
44+
return fixedHeaders == null ? CsvEditorSettings.getInstance().isHeaderRowFixed() : fixedHeaders;
4845
}
4946

5047
public void setFixedHeaders(boolean fixedHeadersArg) {

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvFile.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public void propertyChange(PropertyChangeEvent evt) {
2828
case "defaultEscapeCharacter":
2929
case "defaultValueSeparator":
3030
case "commentIndicator":
31+
case "valueColoring":
3132
FileContentUtilCore.reparseFiles(CsvFile.this.getVirtualFile());
3233
break;
3334
default:

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettings.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public static final class OptionSet {
7272
public int TABLE_DEFAULT_COLUMN_WIDTH = TABLE_DEFAULT_COLUMN_WIDTH_DEFAULT;
7373
public boolean TABLE_AUTO_COLUMN_WIDTH_ON_OPEN = false;
7474
public boolean ZERO_BASED_COLUMN_NUMBERING = false;
75+
public boolean TABLE_HEADER_ROW_FIXED = true;
7576

7677
public boolean SHOW_TABLE_EDITOR_INFO_PANEL = true;
7778
public boolean QUOTING_ENFORCED = false;
@@ -296,7 +297,19 @@ public ValueColoring getValueColoring() {
296297
}
297298

298299
public void setValueColoring(ValueColoring valueColoring) {
300+
ValueColoring oldValue = getValueColoring();
299301
getState().VALUE_COLORING = valueColoring;
302+
if (valueColoring != oldValue) {
303+
myPropertyChangeSupport.firePropertyChange("valueColoring", oldValue, getValueColoring());
304+
}
305+
}
306+
307+
public boolean isHeaderRowFixed() {
308+
return getState().TABLE_HEADER_ROW_FIXED;
309+
}
310+
311+
public void setHeaderRowFixed(boolean headerRowFixed) {
312+
getState().TABLE_HEADER_ROW_FIXED = headerRowFixed;
300313
}
301314

302315
public boolean checkCurrentPluginVersion(String actualVersion) {

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.form‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</grid>
8787
</children>
8888
</grid>
89-
<grid id="3e325" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
89+
<grid id="3e325" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
9090
<margin top="10" left="10" bottom="10" right="10"/>
9191
<constraints>
9292
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -96,23 +96,23 @@
9696
<children>
9797
<component id="97488" class="javax.swing.JCheckBox" binding="cbShowInfoPanel">
9898
<constraints>
99-
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
99+
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
100100
</constraints>
101101
<properties>
102102
<text value="Show info panel"/>
103103
</properties>
104104
</component>
105105
<component id="d6a8e" class="javax.swing.JCheckBox" binding="cbQuotingEnforced">
106106
<constraints>
107-
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
107+
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
108108
</constraints>
109109
<properties>
110110
<text value="Enforce value quoting"/>
111111
</properties>
112112
</component>
113113
<component id="e470c" class="javax.swing.JCheckBox" binding="cbFileEndLineBreak">
114114
<constraints>
115-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
115+
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
116116
</constraints>
117117
<properties>
118118
<text value="Keep/ignore linebreak at file end"/>
@@ -231,6 +231,14 @@
231231
</hspacer>
232232
</children>
233233
</grid>
234+
<component id="8e063" class="javax.swing.JCheckBox" binding="cbHeaderRowFixed">
235+
<constraints>
236+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
237+
</constraints>
238+
<properties>
239+
<text value="Header row fixed (default)"/>
240+
</properties>
241+
</component>
234242
</children>
235243
</grid>
236244
<vspacer id="ff292">

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProvider.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class CsvEditorSettingsProvider implements EditorOptionsProvider {
4242
private JCheckBox cbKeepTrailingWhitespaces;
4343
private JTextField tfCommentIndicator;
4444
private JComboBox comboValueColoring;
45+
private JCheckBox cbHeaderRowFixed;
4546

4647
@NotNull
4748
@Override
@@ -92,7 +93,8 @@ public boolean isModified() {
9293
!Objects.equals(comboValueSeparator.getSelectedItem(), csvEditorSettings.getDefaultValueSeparator()) ||
9394
isModified(cbKeepTrailingWhitespaces, csvEditorSettings.getKeepTrailingSpaces()) ||
9495
isModified(tfCommentIndicator, csvEditorSettings.getCommentIndicator()) ||
95-
!Objects.equals(comboValueColoring.getSelectedItem(), csvEditorSettings.getValueColoring());
96+
!Objects.equals(comboValueColoring.getSelectedItem(), csvEditorSettings.getValueColoring()) ||
97+
isModified(cbHeaderRowFixed, csvEditorSettings.isHeaderRowFixed());
9698
}
9799

98100
@Override
@@ -117,6 +119,7 @@ public void reset() {
117119
cbKeepTrailingWhitespaces.setSelected(csvEditorSettings.getKeepTrailingSpaces());
118120
tfCommentIndicator.setText(csvEditorSettings.getCommentIndicator());
119121
comboValueColoring.setSelectedItem(csvEditorSettings.getValueColoring());
122+
cbHeaderRowFixed.setSelected(csvEditorSettings.isHeaderRowFixed());
120123
}
121124

122125
@Override
@@ -141,6 +144,7 @@ public void apply() throws ConfigurationException {
141144
csvEditorSettings.setKeepTrailingSpaces(cbKeepTrailingWhitespaces.isSelected());
142145
csvEditorSettings.setCommentIndicator(tfCommentIndicator.getText());
143146
csvEditorSettings.setValueColoring((CsvEditorSettings.ValueColoring) comboValueColoring.getSelectedItem());
147+
csvEditorSettings.setHeaderRowFixed(cbHeaderRowFixed.isSelected());
144148
}
145149

146150
protected void createUIComponents() {

‎src/main/resources/META-INF/plugin.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<li>customizable Table Editor</li>
1616
<li>customizable text editor</li>
1717
<li>customizable column coloring</li>
18+
<li>customizable line comment</li>
1819
<li>syntax validation</li>
1920
<li>syntax highlighting</li>
2021
<li>content formatting</li>
@@ -49,7 +50,9 @@
4950

5051
<change-notes><![CDATA[
5152
<pre style="font-family: sans-serif">
53+
NEW: Added default "Header row fixed" setting (enabled)
5254
NEW: Support "Comment with line comment" #247
55+
FIX: "Value coloring" change not applied to open files
5356
</pre>
5457
]]>
5558
</change-notes>

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvEditorSettingsProviderTest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void testResetAndModified() throws ConfigurationException {
7979
csvEditorSettings.setKeepTrailingSpaces(true);
8080
csvEditorSettings.setCommentIndicator("//");
8181
csvEditorSettings.setValueColoring(CsvEditorSettings.ValueColoring.SIMPLE);
82+
csvEditorSettings.setHeaderRowFixed(false);
8283

8384
assertEquals(true, editorSettingsPanel.isModified());
8485

@@ -102,6 +103,7 @@ public void testResetAndModified() throws ConfigurationException {
102103
assertEquals(true, csvEditorSettings.getKeepTrailingSpaces());
103104
assertEquals("//", csvEditorSettings.getCommentIndicator());
104105
assertEquals( CsvEditorSettings.ValueColoring.SIMPLE, csvEditorSettings.getValueColoring());
106+
assertEquals(false, csvEditorSettings.isHeaderRowFixed());
105107

106108
editorSettingsPanel.disposeUIResources();
107109
}
@@ -112,6 +114,7 @@ public void testApply() throws ConfigurationException {
112114
CsvEditorSettings csvEditorSettings = CsvEditorSettings.getInstance();
113115
csvEditorSettings.loadState(new CsvEditorSettings.OptionSet());
114116
editorSettingsPanel.reset();
117+
115118
csvEditorSettings.setCaretRowShown(false);
116119
csvEditorSettings.setUseSoftWraps(true);
117120
csvEditorSettings.setHighlightTabSeparator(false);
@@ -125,6 +128,10 @@ public void testApply() throws ConfigurationException {
125128
csvEditorSettings.setTableAutoColumnWidthOnOpen(false);
126129
csvEditorSettings.setDefaultEscapeCharacter(CsvEscapeCharacter.BACKSLASH);
127130
csvEditorSettings.setDefaultValueSeparator(CsvValueSeparator.PIPE);
131+
csvEditorSettings.setKeepTrailingSpaces(true);
132+
csvEditorSettings.setCommentIndicator("//");
133+
csvEditorSettings.setValueColoring(CsvEditorSettings.ValueColoring.SIMPLE);
134+
csvEditorSettings.setHeaderRowFixed(false);
128135

129136
editorSettingsPanel.apply();
130137

@@ -147,6 +154,10 @@ public void testApply() throws ConfigurationException {
147154
assertEquals(freshOptionSet.KEEP_TRAILING_SPACES, csvEditorSettings.getKeepTrailingSpaces());
148155
assertEquals(freshOptionSet.COMMENT_INDICATOR, csvEditorSettings.getCommentIndicator());
149156
assertEquals(freshOptionSet.VALUE_COLORING, csvEditorSettings.getValueColoring());
157+
assertEquals(freshOptionSet.KEEP_TRAILING_SPACES, csvEditorSettings.getKeepTrailingSpaces());
158+
assertEquals(freshOptionSet.COMMENT_INDICATOR, csvEditorSettings.getCommentIndicator());
159+
assertEquals(freshOptionSet.VALUE_COLORING, csvEditorSettings.getValueColoring());
160+
assertEquals(freshOptionSet.TABLE_HEADER_ROW_FIXED, csvEditorSettings.isHeaderRowFixed());
150161

151162
editorSettingsPanel.disposeUIResources();
152163
}

0 commit comments

Comments
 (0)