mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-09-06 08:18:39 +00:00
fix: rename respectGitIgnore back to codebaseIndexRespectGitIgnore for consistency
This commit is contained in:
parent
7973a571f5
commit
f8cee2b1e4
11 changed files with 21 additions and 21 deletions
|
|
@ -51,7 +51,7 @@ export const codebaseIndexConfigSchema = z.object({
|
|||
// OpenRouter specific fields
|
||||
codebaseIndexOpenRouterSpecificProvider: z.string().optional(),
|
||||
// Gitignore behavior
|
||||
respectGitIgnore: z.boolean().optional(),
|
||||
codebaseIndexRespectGitIgnore: z.boolean().optional(),
|
||||
})
|
||||
|
||||
export type CodebaseIndexConfig = z.infer<typeof codebaseIndexConfigSchema>
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ export interface WebviewMessage {
|
|||
codebaseIndexSearchMaxResults?: number
|
||||
codebaseIndexSearchMinScore?: number
|
||||
codebaseIndexOpenRouterSpecificProvider?: string // OpenRouter provider routing
|
||||
respectGitIgnore?: boolean // Whether to respect .gitignore when listing files
|
||||
codebaseIndexRespectGitIgnore?: boolean // Whether to respect .gitignore when listing files
|
||||
|
||||
// Secret settings
|
||||
codeIndexOpenAiKey?: string
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
|
|||
if (maxFiles === 0) {
|
||||
details += "(Workspace files context disabled. Use list_files to explore if needed.)"
|
||||
} else {
|
||||
const respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true
|
||||
const respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true
|
||||
const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles, respectGitIgnore)
|
||||
const { showRooIgnoredFiles = false } = state ?? {}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ export class ListFilesTool extends BaseTool<"list_files"> {
|
|||
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
||||
|
||||
const state = await task.providerRef.deref()?.getState()
|
||||
const respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true
|
||||
const respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true
|
||||
const [files, didHitLimit] = await listFiles(absolutePath, recursive || false, 200, respectGitIgnore)
|
||||
const { showRooIgnoredFiles = false } = state ?? {}
|
||||
|
||||
|
|
|
|||
|
|
@ -2211,7 +2211,7 @@ export class ClineProvider
|
|||
codebaseIndexBedrockRegion: codebaseIndexConfig?.codebaseIndexBedrockRegion,
|
||||
codebaseIndexBedrockProfile: codebaseIndexConfig?.codebaseIndexBedrockProfile,
|
||||
codebaseIndexOpenRouterSpecificProvider: codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider,
|
||||
respectGitIgnore: codebaseIndexConfig?.respectGitIgnore,
|
||||
codebaseIndexRespectGitIgnore: codebaseIndexConfig?.codebaseIndexRespectGitIgnore,
|
||||
},
|
||||
// Only set mdmCompliant if there's an actual MDM policy
|
||||
// undefined means no MDM policy, true means compliant, false means non-compliant
|
||||
|
|
@ -2451,7 +2451,7 @@ export class ClineProvider
|
|||
codebaseIndexBedrockProfile: stateValues.codebaseIndexConfig?.codebaseIndexBedrockProfile,
|
||||
codebaseIndexOpenRouterSpecificProvider:
|
||||
stateValues.codebaseIndexConfig?.codebaseIndexOpenRouterSpecificProvider,
|
||||
respectGitIgnore: stateValues.codebaseIndexConfig?.respectGitIgnore,
|
||||
codebaseIndexRespectGitIgnore: stateValues.codebaseIndexConfig?.codebaseIndexRespectGitIgnore,
|
||||
},
|
||||
profileThresholds: stateValues.profileThresholds ?? {},
|
||||
includeDiagnosticMessages: stateValues.includeDiagnosticMessages ?? true,
|
||||
|
|
|
|||
|
|
@ -2543,7 +2543,7 @@ export const webviewMessageHandler = async (
|
|||
codebaseIndexSearchMaxResults: settings.codebaseIndexSearchMaxResults,
|
||||
codebaseIndexSearchMinScore: settings.codebaseIndexSearchMinScore,
|
||||
codebaseIndexOpenRouterSpecificProvider: settings.codebaseIndexOpenRouterSpecificProvider,
|
||||
respectGitIgnore: settings.respectGitIgnore,
|
||||
codebaseIndexRespectGitIgnore: settings.codebaseIndexRespectGitIgnore,
|
||||
}
|
||||
|
||||
// Save global state first
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class WorkspaceTracker {
|
|||
let respectGitIgnore = true
|
||||
try {
|
||||
const state = await this.providerRef.deref()?.getState()
|
||||
respectGitIgnore = state?.codebaseIndexConfig?.respectGitIgnore ?? true
|
||||
respectGitIgnore = state?.codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true
|
||||
} catch {
|
||||
// Fall back to default (respect .gitignore) if state is not available
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export class CodeIndexConfigManager {
|
|||
private qdrantApiKey?: string
|
||||
private searchMinScore?: number
|
||||
private searchMaxResults?: number
|
||||
private respectGitIgnore: boolean = true
|
||||
private codebaseIndexRespectGitIgnore: boolean = true
|
||||
|
||||
constructor(private readonly contextProxy: ContextProxy) {
|
||||
// Initialize with current configuration to avoid false restart triggers
|
||||
|
|
@ -87,7 +87,7 @@ export class CodeIndexConfigManager {
|
|||
this.qdrantApiKey = qdrantApiKey ?? ""
|
||||
this.searchMinScore = codebaseIndexSearchMinScore
|
||||
this.searchMaxResults = codebaseIndexSearchMaxResults
|
||||
this.respectGitIgnore = codebaseIndexConfig.respectGitIgnore ?? true
|
||||
this.codebaseIndexRespectGitIgnore = codebaseIndexConfig.codebaseIndexRespectGitIgnore ?? true
|
||||
|
||||
// Validate and set model dimension
|
||||
const rawDimension = codebaseIndexConfig.codebaseIndexEmbedderModelDimension
|
||||
|
|
@ -196,7 +196,7 @@ export class CodeIndexConfigManager {
|
|||
openRouterSpecificProvider: this.openRouterOptions?.specificProvider ?? "",
|
||||
qdrantUrl: this.qdrantUrl ?? "",
|
||||
qdrantApiKey: this.qdrantApiKey ?? "",
|
||||
respectGitIgnore: this.respectGitIgnore,
|
||||
codebaseIndexRespectGitIgnore: this.codebaseIndexRespectGitIgnore,
|
||||
}
|
||||
|
||||
// Refresh secrets from VSCode storage to ensure we have the latest values
|
||||
|
|
@ -413,9 +413,9 @@ export class CodeIndexConfigManager {
|
|||
return true
|
||||
}
|
||||
|
||||
// respectGitIgnore change
|
||||
const prevRespectGitIgnore = prev?.respectGitIgnore ?? true
|
||||
if (prevRespectGitIgnore !== this.respectGitIgnore) {
|
||||
// codebaseIndexRespectGitIgnore change
|
||||
const prevRespectGitIgnore = prev?.codebaseIndexRespectGitIgnore ?? true
|
||||
if (prevRespectGitIgnore !== this.codebaseIndexRespectGitIgnore) {
|
||||
return true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,5 +45,5 @@ export type PreviousConfigSnapshot = {
|
|||
openRouterSpecificProvider?: string
|
||||
qdrantUrl?: string
|
||||
qdrantApiKey?: string
|
||||
respectGitIgnore?: boolean
|
||||
codebaseIndexRespectGitIgnore?: boolean
|
||||
}
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ export class CodeIndexManager {
|
|||
let respectGitIgnore = true
|
||||
try {
|
||||
const codebaseIndexConfig = this._configManager!.getContextProxy()?.getGlobalState("codebaseIndexConfig")
|
||||
respectGitIgnore = codebaseIndexConfig?.respectGitIgnore ?? true
|
||||
respectGitIgnore = codebaseIndexConfig?.codebaseIndexRespectGitIgnore ?? true
|
||||
} catch {
|
||||
// Fall back to default (respect .gitignore) if config proxy is not available
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ interface LocalCodeIndexSettings {
|
|||
codebaseIndexVercelAiGatewayApiKey?: string
|
||||
codebaseIndexOpenRouterApiKey?: string
|
||||
codebaseIndexOpenRouterSpecificProvider?: string
|
||||
respectGitIgnore?: boolean
|
||||
codebaseIndexRespectGitIgnore?: boolean
|
||||
}
|
||||
|
||||
// Validation schema for codebase index settings
|
||||
|
|
@ -226,7 +226,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
|
|||
codebaseIndexVercelAiGatewayApiKey: "",
|
||||
codebaseIndexOpenRouterApiKey: "",
|
||||
codebaseIndexOpenRouterSpecificProvider: "",
|
||||
respectGitIgnore: true,
|
||||
codebaseIndexRespectGitIgnore: true,
|
||||
})
|
||||
|
||||
// Initial settings state - stores the settings when popover opens
|
||||
|
|
@ -267,7 +267,7 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
|
|||
codebaseIndexOpenRouterApiKey: "",
|
||||
codebaseIndexOpenRouterSpecificProvider:
|
||||
codebaseIndexConfig.codebaseIndexOpenRouterSpecificProvider || "",
|
||||
respectGitIgnore: codebaseIndexConfig.respectGitIgnore ?? true,
|
||||
codebaseIndexRespectGitIgnore: codebaseIndexConfig.codebaseIndexRespectGitIgnore ?? true,
|
||||
}
|
||||
setInitialSettings(settings)
|
||||
setCurrentSettings(settings)
|
||||
|
|
@ -1593,9 +1593,9 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
|
|||
<div className="space-y-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<VSCodeCheckbox
|
||||
checked={currentSettings.respectGitIgnore ?? true}
|
||||
checked={currentSettings.codebaseIndexRespectGitIgnore ?? true}
|
||||
onChange={(e: any) =>
|
||||
updateSetting("respectGitIgnore", e.target.checked)
|
||||
updateSetting("codebaseIndexRespectGitIgnore", e.target.checked)
|
||||
}>
|
||||
<span className="font-medium">
|
||||
{t("settings:codeIndex.respectGitIgnoreLabel")}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue