Skip to content

Commit 63765fe

Browse files
committed
Exclude gradle-wrapper.jar from .gitignore checks
1 parent 737c56b commit 63765fe

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
3434
private lateinit var testYaml: VirtualFile
3535
private lateinit var helperPy: VirtualFile
3636
private lateinit var testTf: VirtualFile
37+
private lateinit var gradleFile: VirtualFile
3738

3839
private lateinit var sessionConfigSpy: CodeScanSessionConfig
3940
private lateinit var sessionConfigSpy2: CodeScanSessionConfig
@@ -63,9 +64,9 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
6364
fun `test createPayload`() {
6465
val payload = sessionConfigSpy.createPayload()
6566
assertNotNull(payload)
66-
assertThat(payload.context.totalFiles).isEqualTo(10)
67+
assertThat(payload.context.totalFiles).isEqualTo(11)
6768

68-
assertThat(payload.context.scannedFiles.size).isEqualTo(10)
69+
assertThat(payload.context.scannedFiles.size).isEqualTo(11)
6970
assertThat(payload.context.scannedFiles).contains(testYaml, testTf, readMeMd, utilsJs, utilsCs, testJson, testCs, helperPy, helperCs, helpGo)
7071

7172
assertThat(payload.context.srcPayloadSize).isEqualTo(totalSize)
@@ -80,12 +81,12 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
8081
filesInZip += 1
8182
}
8283

83-
assertThat(filesInZip).isEqualTo(10)
84+
assertThat(filesInZip).isEqualTo(11)
8485
}
8586

8687
@Test
8788
fun `getProjectPayloadMetadata()`() {
88-
getProjectPayloadMetadata(sessionConfigSpy, 10, totalSize, this.totalLines, CodewhispererLanguage.Csharp)
89+
getProjectPayloadMetadata(sessionConfigSpy, 11, totalSize, this.totalLines, CodewhispererLanguage.Csharp)
8990
}
9091

9192
@Test
@@ -105,7 +106,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
105106

106107
@Test
107108
fun `e2e happy path integration test`() = runTest {
108-
assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 10, totalSize, 1)
109+
assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 11, totalSize, 1)
109110
}
110111

111112
private fun setupCsharpProject() {
@@ -373,5 +374,9 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
373374
// The tests include the markdown file but not these two files.
374375
projectRule.fixture.addFileToProject("/.gitignore", "node_modules\n.idea\n.vscode\n.DS_Store").virtualFile
375376
projectRule.fixture.addFileToProject("test.idea", "ref: refs/heads/main")
377+
378+
gradleFile = projectRule.fixture.addFileToProject("gradle/wrapper/gradle-wrapper.jar", "").virtualFile
379+
totalSize += gradleFile.length
380+
totalLines += gradleFile.toNioPath().toFile().readLines().size
376381
}
377382
}

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
112112
suspend fun ignoreFile(file: VirtualFile): Boolean = ignoreFile(file.path)
113113

114114
suspend fun ignoreFile(path: String): Boolean {
115+
// explicitly allow the Gradle wrapper JAR file
116+
if (path.endsWith("gradle/wrapper/gradle-wrapper.jar")) {
117+
return false
118+
}
119+
115120
// this method reads like something a JS dev would write and doesn't do what the author thinks
116121
val deferredResults = ignorePatternsWithGitIgnore.map { pattern ->
117122
withContext(coroutineContext) {

0 commit comments

Comments
 (0)