Skip to content

Commit 822befe

Browse files
authored
Merge pull request #262 from SeeSharpSoft/fb_prepare_215
[INTERNAL] prepare release of v2.15.0
2 parents 15e9fcc + 67ac1ca commit 822befe

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jdk:
33
- openjdk11
44

55
env:
6-
- IDEA_VERSION=PC-2019.3.3 GRAMMAR_KIT_VERSION=2019.3
6+
- IDEA_VERSION=PC-2020.3.3 GRAMMAR_KIT_VERSION=2019.3
77
- IDEA_VERSION=IU-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2019.3
88

99
script: xvfb-run gradle check

CHANGELOG

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2.15.0
2+
Mar 23, 2021
3+
4+
NEW: Default value separator #259
5+
FIX: Removal of deprecated function usage
6+
17
2.14.4
28
Feb 14, 2021
39

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Lightweight CSV Plugin for JetBrains IDE family
99

10-
Compatible with _IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion Gogland DataGrip Rider MPS Android Studio_ - __2017.3.1 and newer__
10+
Compatible with _IntelliJ IDEA PhpStorm WebStorm PyCharm RubyMine AppCode CLion Gogland DataGrip Rider MPS Android Studio_ - __2019.3.5 and newer__
1111

1212
This plugin introduces CSV (_Comma-Separated Values_) as a language to Jetbrains IDE with a syntax definition, structured language elements and associated file types (.csv/.tsv/.psv).
1313
This enables default editor features like syntax validation, highlighting and inspections for CSV-alike files.
@@ -37,7 +37,7 @@ This enables default editor features like syntax validation, highlighting and in
3737

3838
**!!Please note!!**
3939

40-
- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3 and higher_. I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.2.\*, but no additional features or cosmetic fixes.
40+
- Starting with **CSV Plugin 2.10.0**, _new features will only be developed for IntelliJ IDE 2019.3.5 and higher_. ~~I will still release patches for major/critical bugs for previous IDE versions 2017.3.1 - 2019.3.4\*, but no additional features or cosmetic fixes.~~
4141

4242
- Starting with **CSV Plugin 2.11.0**, _Java 9 (53) or higher is required_. Previous versions can be downloaded and installed manually from the following locations: [GitHub Releases](https://github.com/SeeSharpSoft/intellij-csv-validator/releases), [Plugin Repository](https://plugins.jetbrains.com/plugin/10037-csv-plugin/versions) (see also section [Installation](https://github.com/SeeSharpSoft/intellij-csv-validator#installation)).
4343

@@ -132,6 +132,8 @@ The preferred editor usage can be switched between "Text Editor first", "Table E
132132

133133
The following separators are currently supported: **,** (Comma), **;** (Semicolon), **:** (Colon), **|** (Pipe) and **↹** (Tab)
134134

135+
**since 2.15.0:** The default value separator can also be a user defined character sequence.
136+
135137
_Default Value Separator_ defines which separator is used as standard for each newly created or opened CSV file.
136138
The separator character can be changed for each file individually in its editors context menu.
137139

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ buildscript {
1111

1212
plugins {
1313
// https://github.com/JetBrains/gradle-intellij-plugin
14-
id 'org.jetbrains.intellij' version '0.4.10'
14+
id 'org.jetbrains.intellij' version '0.7.2'
1515
id 'jacoco'
16-
id 'com.github.kt3k.coveralls' version '2.8.2'
16+
id 'com.github.kt3k.coveralls' version '2.8.4'
1717
id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
1818
}
1919

@@ -28,7 +28,7 @@ jacocoTestReport {
2828
}
2929

3030
group 'net.seesharpsoft.intellij.plugins'
31-
version '2.14.4'
31+
version '2.15.0'
3232

3333
apply plugin: 'java'
3434
project.sourceCompatibility = JavaVersion.VERSION_11

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050

5151
<change-notes><![CDATA[
5252
<pre style="font-family: sans-serif">
53-
NEW: Auto detect value separator (by count)
53+
NEW: Default value separator #259
54+
FIX: Removal of deprecated function usage
5455
</pre>
5556
]]>
5657
</change-notes>

src/test/java/net/seesharpsoft/intellij/plugins/csv/formatter/CsvFormatterTest.java

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ private void initCsvCodeStyleSettings(boolean SPACE_BEFORE_SEPARATOR,
3232
boolean LEADING_WHITE_SPACES,
3333
boolean ENABLE_WIDE_CHARACTER_DETECTION,
3434
boolean TREAT_AMBIGUOUS_CHARACTERS_AS_WIDE) {
35-
CsvCodeStyleSettings csvCodeStyleSettings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(CsvCodeStyleSettings.class);
35+
// CsvCodeStyleSettings csvCodeStyleSettings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(CsvCodeStyleSettings.class);
36+
CsvCodeStyleSettings csvCodeStyleSettings = CodeStyleSettingsManager.getInstance(getProject()).getTemporarySettings().getCustomSettings(CsvCodeStyleSettings.class);
3637
csvCodeStyleSettings.SPACE_BEFORE_SEPARATOR = SPACE_BEFORE_SEPARATOR;
3738
csvCodeStyleSettings.SPACE_AFTER_SEPARATOR = SPACE_AFTER_SEPARATOR;
3839
csvCodeStyleSettings.TRIM_LEADING_WHITE_SPACES = TRIM_LEADING_WHITE_SPACES;
@@ -70,13 +71,10 @@ private void executeTestConfiguration(int binarySettings, String relativeTargetP
7071

7172
initCsvCodeStyleSettings(binarySettings);
7273

73-
new WriteCommandAction.Simple(getProject()) {
74-
@Override
75-
protected void run() throws Throwable {
76-
CodeStyleManager.getInstance(getProject()).reformatText(myFixture.getFile(),
77-
ContainerUtil.newArrayList(myFixture.getFile().getTextRange()));
78-
}
79-
}.execute();
74+
WriteCommandAction.writeCommandAction(getProject()).run(() -> {
75+
CodeStyleManager.getInstance(getProject()).reformatText(myFixture.getFile(),
76+
ContainerUtil.newArrayList(myFixture.getFile().getTextRange()));
77+
});
8078
if (checkResults) {
8179
myFixture.checkResultByFile(relativeTargetPath + String.format("/TestResult%08d.csv", binarySettings));
8280
}
@@ -171,13 +169,10 @@ public void _testResultGenerator() throws Exception {
171169

172170
initCsvCodeStyleSettings(binarySettings);
173171

174-
new WriteCommandAction.Simple(getProject()) {
175-
@Override
176-
protected void run() throws Throwable {
177-
CodeStyleManager.getInstance(getProject()).reformatText(myFixture.getFile(),
178-
ContainerUtil.newArrayList(myFixture.getFile().getTextRange()));
179-
}
180-
}.execute();
172+
WriteCommandAction.writeCommandAction(getProject()).run(() -> {
173+
CodeStyleManager.getInstance(getProject()).reformatText(myFixture.getFile(),
174+
ContainerUtil.newArrayList(myFixture.getFile().getTextRange()));
175+
});
181176

182177
try (PrintWriter writer = new PrintWriter(getTestDataPath() + String.format("/generated/TestResult%08d.csv", binarySettings))
183178
) {

0 commit comments

Comments
 (0)