Skip to content
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

chore/auto-edit: cleanup the logging with the context source for logging #6901

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore/auto-edit: cleanup the logging with the context source for logging #6901

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
35 changes: 4 additions & 31 deletions vscode/src/completions/context/context-data-logging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { JaccardSimilarityRetriever } from './retrievers/jaccard-similarity/jacc
import { DiagnosticsRetriever } from './retrievers/recent-user-actions/diagnostics-retriever'
import { RecentCopyRetriever } from './retrievers/recent-user-actions/recent-copy'
import { LineLevelDiffStrategy } from './retrievers/recent-user-actions/recent-edits-diff-helpers/line-level-diff'
import { TwoStageUnifiedDiffStrategy } from './retrievers/recent-user-actions/recent-edits-diff-helpers/two-stage-unified-diff'
import { RecentEditsRetriever } from './retrievers/recent-user-actions/recent-edits-retriever'
import { RecentViewPortRetriever } from './retrievers/recent-user-actions/recent-view-port'
import { RetrieverIdentifier } from './utils'
Expand All @@ -37,6 +36,10 @@ export class ContextRetrieverDataCollection implements vscode.Disposable {
{ identifier: RetrieverIdentifier.RecentEditsRetriever },
{ identifier: RetrieverIdentifier.DiagnosticsRetriever, maxSnippets: 15 },
{ identifier: RetrieverIdentifier.RecentViewPortRetriever, maxSnippets: 10 },
{ identifier: RetrieverIdentifier.RecentCopyRetriever, maxSnippets: 1 },
// Jaccard similarity snippets are very large in general (with ~50 lines of code per snippet),
// so we limit the number of snippets.
{ identifier: RetrieverIdentifier.JaccardSimilarityRetriever, maxSnippets: 3 },
]

constructor() {
Expand Down Expand Up @@ -109,28 +112,6 @@ export class ContextRetrieverDataCollection implements vscode.Disposable {
return new RecentEditsRetriever({
maxAgeMs: 10 * 60 * 1000,
diffStrategyList: [
// Only use the last event as a short term diff.
new TwoStageUnifiedDiffStrategy({
longTermContextLines: 3,
shortTermContextLines: 3,
minShortTermEvents: 1,
minShortTermTimeMs: 0,
}),
// Use atleast last 30 seconds of edits as short term diff
new TwoStageUnifiedDiffStrategy({
longTermContextLines: 3,
shortTermContextLines: 3,
minShortTermEvents: 1,
minShortTermTimeMs: 30 * 1000, // 30 seconds
}),
// Use non-overlapping lines combination for long term diffs.
new LineLevelDiffStrategy({
contextLines: 3,
longTermDiffCombinationStrategy: 'lines-based',
minShortTermEvents: 1,
minShortTermTimeMs: 30 * 1000, // 30 seconds,
trimSurroundingContext: false,
}),
// Use unified diff for long term changes, and line based diff for short term changes.
new LineLevelDiffStrategy({
contextLines: 3,
Expand All @@ -139,14 +120,6 @@ export class ContextRetrieverDataCollection implements vscode.Disposable {
minShortTermTimeMs: 2 * 60 * 1000, // 2 minutes,
trimSurroundingContext: false,
}),
// Use raw line based changes for all the diff calculation.
new LineLevelDiffStrategy({
contextLines: 3,
longTermDiffCombinationStrategy: undefined,
minShortTermEvents: 1,
minShortTermTimeMs: 0,
trimSurroundingContext: false,
}),
],
})
case RetrieverIdentifier.DiagnosticsRetriever:
Expand Down
Loading