Merge pull request #1799 from 1c-syntax/fix/contentList

Author: nixel2007

.gitattributes

@@ -4,3 +4,4 @@
 *.md eol=lf
 *.json eol=lf
 *.bat eol=crlf
+src/test/resources/context/DocumentContextBrokenLineFeeds.bsl binary

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java

@@ -65,6 +65,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static java.util.Objects.requireNonNull;
@@ -75,6 +76,8 @@
 @RequiredArgsConstructor
 public class DocumentContext {
 
+  private static final Pattern CONTENT_SPLIT_PATTERN = Pattern.compile("\r?\n|\r");
+
   private final URI uri;
 
   @Nullable
@@ -315,7 +318,7 @@ private static FileType computeFileType(URI uri) {
   }
 
   private String[] computeContentList() {
-    return getContent().split("\n", -1);
+    return CONTENT_SPLIT_PATTERN.split(getContent(), -1);
   }
 
   private SymbolTree computeSymbolTree() {

src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java

@@ -216,6 +216,18 @@ void testContentList() {
     assertThat(contentList).hasSize(40);
   }
 
+  @Test
+  void testContentListWithStandaloneCR() {
+    // given
+    var documentContext = getDocumentContext("./src/test/resources/context/DocumentContextBrokenLineFeeds.bsl");
+
+    // when
+    var contentList = documentContext.getContentList();
+
+    // then
+    assertThat(contentList).hasSize(3);
+  }
+
   @Test
   void testEOF() {
     // given

src/test/resources/context/DocumentContextBrokenLineFeeds.bsl

@@ -0,0 +1 @@
+ПереводCRЕщеОдинCR