Fix ris importer follow up (#7775)

Co-authored-by: Noname690 <[email protected]>

CHANGELOG.md

@@ -46,6 +46,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Fixed
 
+- We fixed an issue where import hangs for ris files with "ER - " [#7737](https://github.com/JabRef/jabref/issues/7737)
 - We fixed an issue where getting bibliograhpic data from DOI or another identifer did not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/6267)
 - We fixed an issue where importing entries would not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/1018)
 - We fixed an issue where an exception occured when importing entries from a web search [#7606](https://github.com/JabRef/jabref/issues/7606)

src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java

@@ -62,7 +62,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         String linesAsString = reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");
 
         String[] entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
-                                        .split("ER  -.*\\n");
+                                        .split("ER  -.*(\\n)*");
 
         // stores all the date tags from highest to lowest priority
         List<String> dateTags = Arrays.asList("Y1", "PY", "DA", "Y2");

src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestWithEmptyER.bib

@@ -0,0 +1,15 @@
+@Article{,
+author    = {Shi, Yu and Beck, Thomas L.},
+title     = {Length scales and interfacial potentials in ion hydration},
+doi       = {10.1063/1.4814070},
+issn      = {0021-9606},
+number    = {4},
+pages     = {044504},
+url       = {https://doi.org/10.1063/1.4814070},
+volume    = {139},
+comment   = {doi: 10.1063/1.4814070},
+journal   = {J. Chem. Phys.},
+month     = jul,
+publisher = {American Institute of Physics},
+year      = {2013},
+}

src/test/resources/org/jabref/logic/importer/fileformat/RisImporterTestWithEmptyER.ris

@@ -0,0 +1,26 @@
+
+
+
+
+
+TY  - JOUR
+T1  - Length scales and interfacial potentials in ion hydration
+AU  - Shi,Yu 
+AU  - Beck,Thomas L. 
+Y1  - 2013/07/22
+PY  - 2013
+DA  - 2013/07/28
+N1  - doi: 10.1063/1.4814070
+DO  - 10.1063/1.4814070
+T2  - The Journal of Chemical Physics
+JF  - The Journal of Chemical Physics
+JO  - J. Chem. Phys.
+SP  - 044504
+VL  - 139
+IS  - 4
+PB  - American Institute of Physics
+SN  - 0021-9606
+M3  - doi: 10.1063/1.4814070
+UR  - https://doi.org/10.1063/1.4814070
+Y2  - 2021/01/24
+ER  -