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
2 changes: 1 addition & 1 deletion src/__tests__/command-mentions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe("Command Mentions", () => {
mockUrlContentFetcher, // urlContentFetcher
undefined, // fileContextTracker
undefined, // rooIgnoreController
true, // showRooIgnoredFiles
false, // showRooIgnoredFiles
true, // includeDiagnosticMessages
50, // maxDiagnosticMessages
undefined, // maxReadFileLine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe("getEnvironmentDetails", () => {
experiments: {},
customInstructions: "test instructions",
language: "en",
showRooIgnoredFiles: true,
showRooIgnoredFiles: false,
}

mockProvider = {
Expand Down Expand Up @@ -173,7 +173,7 @@ describe("getEnvironmentDetails", () => {
["file1.ts", "file2.ts"],
false,
mockCline.rooIgnoreController,
true,
false,
)
})

Expand Down
2 changes: 1 addition & 1 deletion src/core/environment/getEnvironmentDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
details += "(Workspace files context disabled. Use list_files to explore if needed.)"
} else {
const [files, didHitLimit] = await listFiles(cline.cwd, true, maxFiles)
const { showRooIgnoredFiles = true } = state ?? {}
const { showRooIgnoredFiles = false } = state ?? {}

const result = formatResponse.formatFilesList(
cline.cwd,
Expand Down
10 changes: 5 additions & 5 deletions src/core/mentions/__tests__/processUserContentMentions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe("processUserContentMentions", () => {
mockUrlContentFetcher,
mockFileContextTracker,
mockRooIgnoreController,
true,
false,
true, // includeDiagnosticMessages
50, // maxDiagnosticMessages
100,
Expand Down Expand Up @@ -80,7 +80,7 @@ describe("processUserContentMentions", () => {
mockUrlContentFetcher,
mockFileContextTracker,
mockRooIgnoreController,
true,
false,
true, // includeDiagnosticMessages
50, // maxDiagnosticMessages
undefined,
Expand Down Expand Up @@ -110,7 +110,7 @@ describe("processUserContentMentions", () => {
mockUrlContentFetcher,
mockFileContextTracker,
mockRooIgnoreController,
true,
false,
true, // includeDiagnosticMessages
50, // maxDiagnosticMessages
-1,
Expand Down Expand Up @@ -293,7 +293,7 @@ describe("processUserContentMentions", () => {
})

describe("showRooIgnoredFiles parameter", () => {
it("should default showRooIgnoredFiles to true", async () => {
it("should default showRooIgnoredFiles to false", async () => {
const userContent = [
{
type: "text" as const,
Expand All @@ -314,7 +314,7 @@ describe("processUserContentMentions", () => {
mockUrlContentFetcher,
mockFileContextTracker,
undefined,
true, // showRooIgnoredFiles should default to true
false, // showRooIgnoredFiles should default to false
true, // includeDiagnosticMessages
50, // maxDiagnosticMessages
undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/core/mentions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export async function parseMentions(
urlContentFetcher: UrlContentFetcher,
fileContextTracker?: FileContextTracker,
rooIgnoreController?: RooIgnoreController,
showRooIgnoredFiles: boolean = true,
showRooIgnoredFiles: boolean = false,
includeDiagnosticMessages: boolean = true,
maxDiagnosticMessages: number = 50,
maxReadFileLine?: number,
Expand Down Expand Up @@ -270,7 +270,7 @@ async function getFileOrFolderContent(
mentionPath: string,
cwd: string,
rooIgnoreController?: any,
showRooIgnoredFiles: boolean = true,
showRooIgnoredFiles: boolean = false,
maxReadFileLine?: number,
): Promise<string> {
const unescapedPath = unescapeSpaces(mentionPath)
Expand Down
2 changes: 1 addition & 1 deletion src/core/mentions/processUserContentMentions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export async function processUserContentMentions({
urlContentFetcher,
fileContextTracker,
rooIgnoreController,
showRooIgnoredFiles = true,
showRooIgnoredFiles = false,
includeDiagnosticMessages = true,
maxDiagnosticMessages = 50,
maxReadFileLine,
Expand Down
2 changes: 1 addition & 1 deletion src/core/task/Task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1622,7 +1622,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
)

const {
showRooIgnoredFiles = true,
showRooIgnoredFiles = false,
includeDiagnosticMessages = true,
maxDiagnosticMessages = 50,
maxReadFileLine = -1,
Expand Down
2 changes: 1 addition & 1 deletion src/core/tools/listFilesTool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export async function listFilesTool(
cline.consecutiveMistakeCount = 0

const [files, didHitLimit] = await listFiles(absolutePath, recursive, 200)
const { showRooIgnoredFiles = true } = (await cline.providerRef.deref()?.getState()) ?? {}
const { showRooIgnoredFiles = false } = (await cline.providerRef.deref()?.getState()) ?? {}

const result = formatResponse.formatFilesList(
absolutePath,
Expand Down
4 changes: 2 additions & 2 deletions src/core/webview/ClineProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1850,7 +1850,7 @@ export class ClineProvider
telemetrySetting,
telemetryKey,
machineId,
showRooIgnoredFiles: showRooIgnoredFiles ?? true,
showRooIgnoredFiles: showRooIgnoredFiles ?? false,
language: language ?? formatLanguage(vscode.env.language),
renderContext: this.renderContext,
maxReadFileLine: maxReadFileLine ?? -1,
Expand Down Expand Up @@ -2043,7 +2043,7 @@ export class ClineProvider
openRouterUseMiddleOutTransform: stateValues.openRouterUseMiddleOutTransform ?? true,
browserToolEnabled: stateValues.browserToolEnabled ?? true,
telemetrySetting: stateValues.telemetrySetting || "unset",
showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? true,
showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? false,
maxReadFileLine: stateValues.maxReadFileLine ?? -1,
maxImageFileSize: stateValues.maxImageFileSize ?? 5,
maxTotalImageSize: stateValues.maxTotalImageSize ?? 20,
Expand Down
6 changes: 3 additions & 3 deletions src/core/webview/__tests__/ClineProvider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ describe("ClineProvider", () => {
maxWorkspaceFiles: 200,
browserToolEnabled: true,
telemetrySetting: "unset",
showRooIgnoredFiles: true,
showRooIgnoredFiles: false,
renderContext: "sidebar",
maxReadFileLine: 500,
maxImageFileSize: 5,
Expand Down Expand Up @@ -984,8 +984,8 @@ describe("ClineProvider", () => {
await provider.resolveWebviewView(mockWebviewView)
const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]

// Default value should be true
expect((await provider.getState()).showRooIgnoredFiles).toBe(true)
// Default value should be false
expect((await provider.getState()).showRooIgnoredFiles).toBe(false)

// Test showRooIgnoredFiles with true
await messageHandler({ type: "showRooIgnoredFiles", bool: true })
Expand Down
2 changes: 1 addition & 1 deletion src/core/webview/webviewMessageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ export const webviewMessageHandler = async (
await provider.postStateToWebview()
break
case "showRooIgnoredFiles":
await updateGlobalState("showRooIgnoredFiles", message.bool ?? true)
await updateGlobalState("showRooIgnoredFiles", message.bool ?? false)
await provider.postStateToWebview()
break
case "hasOpenedModeSelector":
Expand Down
Loading