Skip to content

0.25.1 #3677

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 5 commits into from
Dec 18, 2025
Merged

0.25.1 #3677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ceec7b
Mark parameter usages with SemanticTokenTypes.Parameter (#3674)
Copilot Dec 17, 2025
f7147fd
Update utils dependency version to 0.6.7
nixel2007 Dec 18, 2025
3d309e8
Merge pull request #3675 from 1c-syntax/nixel2007-patch-2
nixel2007 Dec 18, 2025
e3332e0
Update io.github.1c-syntax utils version to 0.6.8
nixel2007 Dec 18, 2025
963574c
Merge pull request #3676 from 1c-syntax/nixel2007-patch-2
nixel2007 Dec 18, 2025
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
exclude("org.antlr", "ST4")
exclude("org.antlr", "antlr-runtime")
}
api("io.github.1c-syntax", "utils", "0.6.6")
api("io.github.1c-syntax", "utils", "0.6.8")
api("io.github.1c-syntax", "mdclasses", "0.17.0")
api("io.github.1c-syntax", "bsl-common-library", "0.9.0")
api("io.github.1c-syntax", "supportconf", "0.15.0")
Expand Down
31 changes: 28 additions & 3 deletions src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/SemanticTokensProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@
import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
import com.github._1c_syntax.bsl.languageserver.context.symbol.ParameterDefinition;
import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
import com.github._1c_syntax.bsl.languageserver.context.symbol.description.MethodDescription;
import com.github._1c_syntax.bsl.languageserver.context.symbol.description.SourceDefinedSymbolDescription;
import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableDescription;
import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
import com.github._1c_syntax.bsl.languageserver.events.LanguageServerInitializeRequestReceivedEvent;
import com.github._1c_syntax.bsl.languageserver.references.ReferenceIndex;
import com.github._1c_syntax.bsl.languageserver.references.ReferenceResolver;
import com.github._1c_syntax.bsl.languageserver.references.model.OccurrenceType;
import com.github._1c_syntax.bsl.languageserver.references.model.Reference;
import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
import com.github._1c_syntax.bsl.languageserver.utils.Trees;
import com.github._1c_syntax.bsl.parser.BSLLexer;
Expand Down Expand Up @@ -237,10 +240,13 @@ private void addVariableSymbols(
BitSet documentationLines
) {
for (var variableSymbol : symbolTree.getVariables()) {
if (variableSymbol.getKind() == VariableKind.PARAMETER) {
continue;
}

var nameRange = variableSymbol.getVariableNameRange();
if (!Ranges.isEmpty(nameRange)) {
Position pos = nameRange.getStart();
boolean isDefinition = referenceResolver.findReference(documentContext.getUri(), pos)
boolean isDefinition = referenceResolver.findReference(documentContext.getUri(), nameRange.getStart())
.map(ref -> ref.getOccurrenceType() == OccurrenceType.DEFINITION)
.orElse(false);
if (isDefinition) {
Expand All @@ -249,6 +255,7 @@ private void addVariableSymbols(
addRange(entries, nameRange, SemanticTokenTypes.Variable);
}
}

variableSymbol.getDescription().ifPresent((VariableDescription description) -> {
processVariableDescription(descriptionRanges, documentationLines, description);

Expand All @@ -257,14 +264,32 @@ private void addVariableSymbols(
);
});
}

var references = referenceIndex.getReferencesFrom(documentContext.getUri(), SymbolKind.Variable);
references.stream()
.filter(Reference::isSourceDefinedSymbolReference)
.forEach(reference -> reference.getSourceDefinedSymbol()
.filter(symbol -> symbol instanceof VariableSymbol)
.map(symbol -> (VariableSymbol) symbol)
.ifPresent(variableSymbol -> {
var tokenType = variableSymbol.getKind() == VariableKind.PARAMETER
? SemanticTokenTypes.Parameter
: SemanticTokenTypes.Variable;

if (reference.getOccurrenceType() == OccurrenceType.DEFINITION) {
addRange(entries, reference.getSelectionRange(), tokenType, SemanticTokenModifiers.Definition);
} else {
addRange(entries, reference.getSelectionRange(), tokenType);
}
}));
}

private void addMethodSymbols(SymbolTree symbolTree, List<TokenEntry> entries, List<Range> descriptionRanges, BitSet documentationLines) {
for (var method : symbolTree.getMethods()) {
var semanticTokenType = method.isFunction() ? SemanticTokenTypes.Function : SemanticTokenTypes.Method;
addRange(entries, method.getSubNameRange(), semanticTokenType);
for (ParameterDefinition parameter : method.getParameters()) {
addRange(entries, parameter.getRange(), SemanticTokenTypes.Parameter);
addRange(entries, parameter.getRange(), SemanticTokenTypes.Parameter, SemanticTokenModifiers.Definition);
}
method.getDescription().ifPresent((MethodDescription description) ->
processVariableDescription(descriptionRanges, documentationLines, description)
Expand Down
Loading
Loading