Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions changelog.d/unreleased/4057.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
category: fixed
issues:
- 4057
affected:
- src/CodeIndex/Database/DbSymbolReader.cs
- tests/CodeIndex.Tests/DbReaderTests.cs
---

## English

- **Symbol line lookups now use explicit SQLite parameter binding (#4057)** — `AnalyzeFileLine` no longer relies on `AddWithValue` inside symbol lookup queries, so the dotnet risk audit stays aligned with the repository SQLite command policy.

## 日本語

- **シンボル行 lookup が明示的な SQLite parameter binding を使うようになりました (#4057)** — `AnalyzeFileLine` のシンボル lookup query 内で `AddWithValue` に依存しなくなり、dotnet risk audit がリポジトリの SQLite command policy と揃うようになりました。
10 changes: 5 additions & 5 deletions src/CodeIndex/Database/DbSymbolReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1821,13 +1821,13 @@ AND @line BETWEEN {bodyStartLineSql} AND {bodyEndLineSql}
LIMIT @limit";

cmd.CommandText = sql;
cmd.Parameters.AddWithValue("@path", path);
cmd.Parameters.AddWithValue("@line", line);
cmd.Parameters.AddWithValue("@limit", limit);
SqliteCommandPolicy.Add(cmd, "@path", path);
SqliteCommandPolicy.Add(cmd, "@line", line);
SqliteCommandPolicy.Add(cmd, "@limit", limit);
if (kind != null)
cmd.Parameters.AddWithValue("@kind", kind);
SqliteCommandPolicy.Add(cmd, "@kind", kind);
if (lang != null)
cmd.Parameters.AddWithValue("@lang", lang);
SqliteCommandPolicy.Add(cmd, "@lang", lang);

var results = new List<SymbolResult>();
using var reader = cmd.ExecuteTrackedReader();
Expand Down
30 changes: 30 additions & 0 deletions tests/CodeIndex.Tests/DbReaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2570,6 +2570,36 @@ public void SearchSymbols_BreaksSameLineTiesByStartColumn()
Assert.Equal(["early SameLine()", "late SameLine()"], results.Select(result => result.Signature).ToArray());
}

[Fact]
public void AnalyzeFileLine_WithKindAndLanguageFilters_ReturnsSymbolAtLine_Issue4057()
{
InsertIndexedFile(
"src/issue4057/LineLookup.cs",
"csharp",
"""
public class LineLookup
{
public void Outside() { }
public void Target()
{
}
}
""");

var analysis = _reader.AnalyzeFileLine(
"src/issue4057/LineLookup.cs",
line: 5,
limit: 5,
lang: "csharp",
kind: "function");

var definition = Assert.Single(analysis.Definitions);
Assert.Equal("Target", definition.Name);
Assert.Equal("function", definition.Kind);
Assert.Equal("csharp", definition.Lang);
Assert.Equal("src/issue4057/LineLookup.cs", definition.Path);
}

[Fact]
public void SearchSymbols_CSharpOperatorsConversionsAndIndexersUseNavigableNames()
{
Expand Down
Loading