Skip to content

Commit b42a8b5

Browse files
committed
Rename method
1 parent 8bbe411 commit b42a8b5

File tree

12 files changed

+21
-21
lines changed

12 files changed

+21
-21
lines changed

internal/compiler/checkerpool.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
type CheckerPool interface {
1515
GetChecker(ctx context.Context) (*checker.Checker, func())
16-
GetCheckerForFile(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func())
16+
GetCheckerForFileNonexclusive(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func())
1717
GetCheckerForFileExclusive(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func())
1818
GetAllCheckers(ctx context.Context) ([]*checker.Checker, func())
1919
Files(checker *checker.Checker) iter.Seq[*ast.SourceFile]
@@ -42,14 +42,14 @@ func newCheckerPool(checkerCount int, program *Program) *checkerPool {
4242
return pool
4343
}
4444

45-
func (p *checkerPool) GetCheckerForFile(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func()) {
45+
func (p *checkerPool) GetCheckerForFileNonexclusive(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func()) {
4646
p.createCheckers()
4747
checker := p.fileAssociations[file]
4848
return checker, noop
4949
}
5050

5151
func (p *checkerPool) GetCheckerForFileExclusive(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func()) {
52-
c, done := p.GetCheckerForFile(ctx, file)
52+
c, done := p.GetCheckerForFileNonexclusive(ctx, file)
5353
idx := slices.Index(p.checkers, c)
5454
p.locks[idx].Lock()
5555
return c, sync.OnceFunc(func() {

internal/compiler/emitHost.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type emitHost struct {
3535
}
3636

3737
func newEmitHost(ctx context.Context, program *Program, file *ast.SourceFile) (*emitHost, func()) {
38-
checker, done := program.GetTypeCheckerForFile(ctx, file)
38+
checker, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
3939
return &emitHost{
4040
program: program,
4141
emitResolver: checker.GetEmitResolver(),

internal/compiler/program.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ func (p *Program) GetTypeCheckers(ctx context.Context) ([]*checker.Checker, func
379379
// method returns the checker that was tasked with checking the file. Note that it isn't possible to mix
380380
// types obtained from different checkers, so only non-type data (such as diagnostics or string
381381
// representations of types) should be obtained from checkers returned by this method.
382-
func (p *Program) GetTypeCheckerForFile(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func()) {
383-
return p.checkerPool.GetCheckerForFile(ctx, file)
382+
func (p *Program) GetTypeCheckerForFileNonexclusive(ctx context.Context, file *ast.SourceFile) (*checker.Checker, func()) {
383+
return p.checkerPool.GetCheckerForFileNonexclusive(ctx, file)
384384
}
385385

386386
// Return a checker for the given file, locked to the current thread to prevent data races from multiple threads
@@ -1029,7 +1029,7 @@ func (p *Program) getSemanticDiagnosticsForFileNotFilter(ctx context.Context, so
10291029
var fileChecker *checker.Checker
10301030
var done func()
10311031
if sourceFile != nil {
1032-
fileChecker, done = p.checkerPool.GetCheckerForFile(ctx, sourceFile)
1032+
fileChecker, done = p.checkerPool.GetCheckerForFileNonexclusive(ctx, sourceFile)
10331033
defer done()
10341034
}
10351035
diags := slices.Clip(sourceFile.BindDiagnostics())
@@ -1134,7 +1134,7 @@ func (p *Program) getSuggestionDiagnosticsForFile(ctx context.Context, sourceFil
11341134
var fileChecker *checker.Checker
11351135
var done func()
11361136
if sourceFile != nil {
1137-
fileChecker, done = p.checkerPool.GetCheckerForFile(ctx, sourceFile)
1137+
fileChecker, done = p.checkerPool.GetCheckerForFileNonexclusive(ctx, sourceFile)
11381138
defer done()
11391139
}
11401140

internal/ls/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ func (l *LanguageService) GetSymbolAtPosition(ctx context.Context, fileName stri
2424
if node == nil {
2525
return nil, fmt.Errorf("%w: %s:%d", ErrNoTokenAtPosition, fileName, position)
2626
}
27-
checker, done := program.GetTypeCheckerForFile(ctx, file)
27+
checker, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
2828
defer done()
2929
return checker.GetSymbolAtLocation(node), nil
3030
}
3131

3232
func (l *LanguageService) GetSymbolAtLocation(ctx context.Context, node *ast.Node) *ast.Symbol {
3333
program := l.GetProgram()
34-
checker, done := program.GetTypeCheckerForFile(ctx, ast.GetSourceFileOfNode(node))
34+
checker, done := program.GetTypeCheckerForFileNonexclusive(ctx, ast.GetSourceFileOfNode(node))
3535
defer done()
3636
return checker.GetSymbolAtLocation(node)
3737
}

internal/ls/completions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func (l *LanguageService) getCompletionsAtPosition(
388388
)
389389
}
390390

391-
checker, done := l.GetProgram().GetTypeCheckerForFile(ctx, file)
391+
checker, done := l.GetProgram().GetTypeCheckerForFileNonexclusive(ctx, file)
392392
defer done()
393393
preferences := l.UserPreferences()
394394
data := l.getCompletionData(ctx, checker, file, position, preferences)
@@ -1941,7 +1941,7 @@ func (l *LanguageService) getCompletionEntriesFromSymbols(
19411941
) (uniqueNames collections.Set[string], sortedEntries []*lsproto.CompletionItem) {
19421942
closestSymbolDeclaration := getClosestSymbolDeclaration(data.contextToken, data.location)
19431943
useSemicolons := lsutil.ProbablyUsesSemicolons(file)
1944-
typeChecker, done := l.GetProgram().GetTypeCheckerForFile(ctx, file)
1944+
typeChecker, done := l.GetProgram().GetTypeCheckerForFileNonexclusive(ctx, file)
19451945
defer done()
19461946
isMemberCompletion := isMemberCompletionKind(data.completionKind)
19471947
// Tracks unique names.
@@ -5056,7 +5056,7 @@ func (l *LanguageService) getCompletionItemDetails(
50565056
itemData *CompletionItemData,
50575057
clientOptions *lsproto.CompletionClientCapabilities,
50585058
) *lsproto.CompletionItem {
5059-
checker, done := program.GetTypeCheckerForFile(ctx, file)
5059+
checker, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
50605060
defer done()
50615061
docFormat := getCompletionDocumentationFormat(clientOptions)
50625062
contextToken, previousToken := getRelevantTokens(position, file)

internal/ls/definition.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (l *LanguageService) ProvideDefinition(
2626
}
2727
originSelectionRange := l.createLspRangeFromNode(node, file)
2828

29-
c, done := program.GetTypeCheckerForFile(ctx, file)
29+
c, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
3030
defer done()
3131

3232
if node.Kind == ast.KindOverrideKeyword {
@@ -77,7 +77,7 @@ func (l *LanguageService) ProvideTypeDefinition(
7777
}
7878
originSelectionRange := l.createLspRangeFromNode(node, file)
7979

80-
c, done := program.GetTypeCheckerForFile(ctx, file)
80+
c, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
8181
defer done()
8282

8383
node = getDeclarationNameForKeyword(node)

internal/ls/hover.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (l *LanguageService) ProvideHover(ctx context.Context, documentURI lsproto.
2525
// Avoid giving quickInfo for the sourceFile as a whole.
2626
return lsproto.HoverOrNull{}, nil
2727
}
28-
c, done := program.GetTypeCheckerForFile(ctx, file)
28+
c, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
2929
defer done()
3030
rangeNode := getNodeForQuickInfo(node)
3131
quickInfo, documentation := l.getQuickInfoAndDocumentationForSymbol(c, c.GetSymbolAtLocation(node), rangeNode, contentFormat)

internal/ls/inlay_hints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (l *LanguageService) ProvideInlayHint(
3131
program, file := l.getProgramAndFile(params.TextDocument.Uri)
3232
quotePreference := getQuotePreference(file, l.UserPreferences())
3333

34-
checker, done := program.GetTypeCheckerForFile(ctx, file)
34+
checker, done := program.GetTypeCheckerForFileNonexclusive(ctx, file)
3535
defer done()
3636
inlayHintState := &inlayHintState{
3737
ctx: ctx,

internal/ls/signaturehelp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (l *LanguageService) GetSignatureHelpItems(
6767
clientOptions *lsproto.SignatureHelpClientCapabilities,
6868
docFormat lsproto.MarkupKind,
6969
) *lsproto.SignatureHelp {
70-
typeChecker, done := program.GetTypeCheckerForFile(ctx, sourceFile)
70+
typeChecker, done := program.GetTypeCheckerForFileNonexclusive(ctx, sourceFile)
7171
defer done()
7272

7373
// Decide whether to show signature help

internal/ls/string_completions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func (l *LanguageService) getStringLiteralCompletionEntries(
225225
node *ast.StringLiteralLike,
226226
position int,
227227
) *stringLiteralCompletions {
228-
typeChecker, done := l.GetProgram().GetTypeCheckerForFile(ctx, file)
228+
typeChecker, done := l.GetProgram().GetTypeCheckerForFileNonexclusive(ctx, file)
229229
defer done()
230230
parent := walkUpParentheses(node.Parent)
231231
switch parent.Kind {

0 commit comments

Comments
 (0)