Skip to content

Commit e7756a4

Browse files
SeeSharpSoftSeeSharpSoft
authored
Merge pull request #138 from SeeSharpSoft/fb_eap_compatibility
Compatibility for newest EAP
2 parents 2e58047 + 80244e7 commit e7756a4

22 files changed

+65
-60
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ after_success:
1515
jobs:
1616
include:
1717
- if: (branch = master AND type = push) OR (type = pull_request)
18-
env: IDEA_VERSION=LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.6
18+
env: IDEA_VERSION=PC-LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.6
1919
script: xvfb-run gradle check verifyPlugin
2020
- stage: deploy
2121
if: branch IN (Testing, Staging, Stable) AND type = push

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ buildscript {
1010
}
1111

1212
plugins {
13+
// https://github.com/JetBrains/gradle-intellij-plugin
1314
id 'org.jetbrains.intellij' version '0.4.9'
1415
id 'jacoco'
1516
id 'com.github.kt3k.coveralls' version '2.8.2'
@@ -69,7 +70,7 @@ idea {
6970
apply plugin: 'org.jetbrains.intellij'
7071
intellij {
7172
// IDE version - https://www.jetbrains.com/intellij-repository/releases
72-
version = System.getenv().getOrDefault('IDEA_VERSION', '2019.1.2')
73+
version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2018.3.2')
7374
pluginName = 'CSV Plugin'
7475
instrumentCode = true
7576
updateSinceUntilBuild = false

‎src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvFileTypeFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
public class CsvFileTypeFactory extends FileTypeFactory {
88
@Override
99
public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) {
10-
fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[]{"csv", "CSV", "Csv"}));
10+
fileTypeConsumer.consume(CsvFileType.INSTANCE, String.join(FileTypeConsumer.EXTENSION_DELIMITER, new String[]{"csv"}));
1111
}
1212
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ FIX: ConcurrentModificationException in MultiLineCellRenderer
5959
<depends>com.intellij.modules.lang</depends>
6060

6161
<extensions defaultExtensionNs="com.intellij">
62+
<fileType name="FileType_CSV" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv"/>
63+
<fileType name="FileType_TSV" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab"/>
64+
<fileType name="FileType_PSV" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv"/>
65+
66+
<!-- backward compatibility -->
6267
<fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeFactory"/>
6368
<fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.tsv.TsvFileTypeFactory"/>
6469
<fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.psv.PsvFileTypeFactory"/>

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/actions/CsvChangeSeparatorActionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.seesharpsoft.intellij.plugins.csv.actions;
22

33
import com.intellij.openapi.actionSystem.Presentation;
4-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
4+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
55
import net.seesharpsoft.intellij.plugins.csv.settings.CsvCodeStyleSettings;
66

7-
public class CsvChangeSeparatorActionTest extends LightCodeInsightFixtureTestCase {
7+
public class CsvChangeSeparatorActionTest extends LightPlatformCodeInsightFixtureTestCase {
88

99
@Override
1010
protected String getTestDataPath() {

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.intellij.psi.search.GlobalSearchScope;
1515
import com.intellij.testFramework.EdtTestUtil;
1616
import com.intellij.testFramework.ExpectedHighlightingData;
17-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
17+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
1818
import org.jetbrains.annotations.NotNull;
1919

2020
import java.util.Collections;
@@ -23,7 +23,7 @@
2323

2424
import static net.seesharpsoft.intellij.plugins.csv.editor.CsvAnnotator.CSV_COLUMN_INFO_SEVERITY;
2525

26-
public class CsvAnnotatorTest extends LightCodeInsightFixtureTestCase {
26+
public class CsvAnnotatorTest extends LightPlatformCodeInsightFixtureTestCase {
2727

2828
@Override
2929
protected String getTestDataPath() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package net.seesharpsoft.intellij.plugins.csv.editor;
22

33
import com.intellij.openapi.options.ConfigurationException;
4-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
4+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
55

66
import java.awt.*;
77

8-
public class CsvEditorSettingsProviderTest extends LightCodeInsightFixtureTestCase {
8+
public class CsvEditorSettingsProviderTest extends LightPlatformCodeInsightFixtureTestCase {
99

1010
@Override
1111
protected String getTestDataPath() {

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvFileEditorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import com.intellij.openapi.fileEditor.*;
55
import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
66
import com.intellij.openapi.fileEditor.impl.text.TextEditorState;
7-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
7+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
88
import org.jdom.Element;
99

10-
public class CsvFileEditorTest extends LightCodeInsightFixtureTestCase {
10+
public class CsvFileEditorTest extends LightPlatformCodeInsightFixtureTestCase {
1111

1212
@Override
1313
protected String getTestDataPath() {
@@ -84,7 +84,7 @@ public void testCsvEditorStateReadsAndWritesStates() {
8484
CsvFileEditorProvider fileEditorProvider = (CsvFileEditorProvider)fileEditorProviders[0];
8585
Element dummy = new Element("dummy");
8686

87-
FileEditorState state = fileEditorProvider.readState(dummy, this.getProject(), this.getFile().getVirtualFile());
87+
FileEditorState state = fileEditorProvider.readState(dummy, this.getProject(), myFixture.getFile().getVirtualFile());
8888
assertInstanceOf(state, TextEditorState.class);
8989
textEditor.setState(state);
9090
fileEditorProvider.writeState(state, this.getProject(), dummy);

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorProviderTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import com.intellij.openapi.fileEditor.FileEditorProvider;
66
import com.intellij.openapi.fileEditor.FileEditorState;
77
import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
8-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
8+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
99
import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
1010
import org.jdom.Element;
1111

1212
import java.util.Objects;
1313

14-
public class CsvTableEditorProviderTest extends LightCodeInsightFixtureTestCase {
14+
public class CsvTableEditorProviderTest extends LightPlatformCodeInsightFixtureTestCase {
1515

1616
@Override
1717
protected String getTestDataPath() {
@@ -26,37 +26,37 @@ protected void setUp() throws Exception {
2626
}
2727

2828
public void testCsvTableEditorProviderIsAvailableAndHasCorrectNameAndPolicy() {
29-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), getFile().getVirtualFile());
29+
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
3030
assertEquals(2, fileEditorProviders.length);
3131
assertInstanceOf(fileEditorProviders[1], CsvTableEditorProvider.class);
3232

3333
FileEditorProvider fileEditorProvider = fileEditorProviders[1];
3434
assertEquals(CsvTableEditorProvider.EDITOR_TYPE_ID, fileEditorProvider.getEditorTypeId());
3535
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
36-
assertEquals(true, fileEditorProvider.accept(getProject(), getFile().getVirtualFile()));
36+
assertEquals(true, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
3737

3838
CsvEditorSettingsExternalizable csvEditorSettingsExternalizable = CsvEditorSettingsExternalizable.getInstance();
3939
csvEditorSettingsExternalizable.setEditorPrio(CsvEditorSettingsExternalizable.EditorPrio.TEXT_ONLY);
4040
assertEquals(FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
41-
assertEquals(false, fileEditorProvider.accept(getProject(), getFile().getVirtualFile()));
41+
assertEquals(false, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
4242

4343
csvEditorSettingsExternalizable.setEditorPrio(CsvEditorSettingsExternalizable.EditorPrio.TABLE_FIRST);
4444
assertEquals(FileEditorPolicy.HIDE_DEFAULT_EDITOR, fileEditorProvider.getPolicy());
45-
assertEquals(true, fileEditorProvider.accept(getProject(), getFile().getVirtualFile()));
45+
assertEquals(true, fileEditorProvider.accept(getProject(), myFixture.getFile().getVirtualFile()));
4646
}
4747

4848
public void testCsvTableEditorCreatesInstanceOfCsvTableEditor() {
49-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), getFile().getVirtualFile());
49+
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
5050
FileEditorProvider fileEditorProvider = fileEditorProviders[1];
5151

52-
FileEditor fileEditor = fileEditorProvider.createEditor(getProject(), getFile().getVirtualFile());
52+
FileEditor fileEditor = fileEditorProvider.createEditor(getProject(), myFixture.getFile().getVirtualFile());
5353
assertInstanceOf(fileEditor, CsvTableEditor.class);
5454

5555
fileEditorProvider.disposeEditor(fileEditor);
5656
}
5757

5858
public void testWriteAndReadTableEditorState() {
59-
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), getFile().getVirtualFile());
59+
FileEditorProvider[] fileEditorProviders = FileEditorProviderManager.getInstance().getProviders(getProject(), myFixture.getFile().getVirtualFile());
6060
FileEditorProvider fileEditorProvider = fileEditorProviders[1];
6161

6262
CsvTableEditorState editorState = new CsvTableEditorState();
@@ -67,7 +67,7 @@ public void testWriteAndReadTableEditorState() {
6767
Element element = new Element("state");
6868
fileEditorProvider.writeState(editorState, getProject(), element);
6969

70-
FileEditorState readState = fileEditorProvider.readState(element, getProject(), getFile().getVirtualFile());
70+
FileEditorState readState = fileEditorProvider.readState(element, getProject(), myFixture.getFile().getVirtualFile());
7171

7272
assertInstanceOf(readState, CsvTableEditorState.class);
7373

‎src/test/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditorStateTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.seesharpsoft.intellij.plugins.csv.editor.table;
22

3-
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
3+
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
44
import net.seesharpsoft.intellij.plugins.csv.editor.CsvEditorSettingsExternalizable;
55
import org.jdom.Element;
66

7-
public class CsvTableEditorStateTest extends LightCodeInsightFixtureTestCase {
7+
public class CsvTableEditorStateTest extends LightPlatformCodeInsightFixtureTestCase {
88

99
@Override
1010
protected String getTestDataPath() {
@@ -29,7 +29,7 @@ public void testCsvTableEditorStateSerializationAndDeserialization() {
2929

3030
originalTableEditorState.write(getProject(), domElement);
3131

32-
CsvTableEditorState deserializeEditorState = CsvTableEditorState.create(domElement, this.getProject(), this.getFile().getVirtualFile());
32+
CsvTableEditorState deserializeEditorState = CsvTableEditorState.create(domElement, this.getProject(), myFixture.getFile().getVirtualFile());
3333

3434
assertOrderedEquals(deserializeEditorState.getColumnWidths(), originalTableEditorState.getColumnWidths());
3535
assertEquals(originalTableEditorState.getRowLines(), deserializeEditorState.getRowLines());

0 commit comments

Comments
 (0)