Skip to content

DocumentContext сделан Comparable #3389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nixel2007 merged 1 commit into from
Jan 19, 2025
Merged

DocumentContext сделан Comparable #3389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@
import com.github._1c_syntax.bsl.types.ConfigurationSource;
import com.github._1c_syntax.bsl.types.ModuleType;
import com.github._1c_syntax.utils.Lazy;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import jakarta.annotation.PostConstruct;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
Expand All @@ -65,12 +67,12 @@
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
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;
import static org.antlr.v4.runtime.Token.DEFAULT_CHANNEL;
Expand All @@ -79,16 +81,20 @@
@Scope("prototype")
@RequiredArgsConstructor
@Slf4j
public class DocumentContext {
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
public class DocumentContext implements Comparable<DocumentContext> {

private static final Pattern CONTENT_SPLIT_PATTERN = Pattern.compile("\r?\n|\r");

@Getter
@EqualsAndHashCode.Include
private final URI uri;

@Nullable
private String content;

@Getter
@EqualsAndHashCode.Include
private int version;

@Setter(onMethod = @__({@Autowired}))
Expand Down Expand Up @@ -158,13 +164,13 @@ public List<Token> getTokens() {
}

public List<Token> getTokensFromDefaultChannel() {
return getTokens().stream().filter(token -> token.getChannel() == DEFAULT_CHANNEL).collect(Collectors.toList());
return getTokens().stream().filter(token -> token.getChannel() == DEFAULT_CHANNEL).toList();
}

public List<Token> getComments() {
return getTokens().stream()
.filter(token -> token.getType() == BSLLexer.LINE_COMMENT)
.collect(Collectors.toList());
.toList();
}

public String getText(Range range) {
Expand Down Expand Up @@ -429,4 +435,10 @@ private List<SDBLTokenizer> computeQueries() {
return (new QueryComputer(this)).compute();
}

@Override
public int compareTo(@NonNull DocumentContext other) {
return Comparator.comparing(DocumentContext::getUri)
.thenComparing(DocumentContext::getVersion)
.compare(this, other);
}
}
Loading