Dynamic retrieval of source directory names #181
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was
linked to
issues
May 20, 2025
Closed
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the file‐resolution logic to dynamically retrieve source and resource directory paths from each module’s configuration instead of using hard-coded values. It also refactors DAO and SQL file lookup methods, simplifies import statements, and removes deprecated or unused code.
- Dynamically retrieves module directories (source, resource, test source, test resource) using CommonPathParameter.
- Refactors DAO package renaming and SQL file path utilities to improve maintainability.
- Removes unused code (e.g. BindVariableElement, redundant overrides) and updates file paths in test cases.
Reviewed Changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/test/kotlin/org/domaframework/doma/intellij/DomaSqlTest.kt | Updates hard-coded directory paths to use dynamic variables. |
| src/main/kotlin/org/domaframework/doma/intellij/refactoring/dao/DaoPackageRenameListenerProcessor.kt | Adjusts handling of VirtualFile objects and package moves in DAO renaming. |
| src/main/kotlin/org/domaframework/doma/intellij/gutter/sql/SqlLineMakerProvider.kt | Introduces PsiDaoMethod for improved SQL file method checks. |
| src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlUpdateValueGroupBlock.kt | Removes unused code for constructing block indentation lengths. |
| src/main/kotlin/org/domaframework/doma/intellij/extension/ModuleExtensions.kt | Replaces old path formatting with new relative SQL file path resolution. |
| src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiDaoMethod.kt | Refactors SQL file path logic and introduces dynamic test file detection. |
| src/main/kotlin/org/domaframework/doma/intellij/common/dao/DaoMethodUtil.kt | Updates DAO file search logic with improved path resolution. |
| src/main/kotlin/org/domaframework/doma/intellij/common/CommonPathParameter.kt | Replaces static paths with dynamic retrieval of module source/resource directories. |
| Others | Minor cleanups in formatting and removal of obsolete methods. |
Comments suppressed due to low confidence (1)
src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiDaoMethod.kt:76
- The variable 'daoFile' is used in setTest() but is not defined within this scope. Replace 'daoFile' with the appropriate variable (for example, psiMethod.containingFile.virtualFile) or ensure that 'daoFile' is properly defined before its usage.
isTest = pathParameter.isTest(daoFile)
xterao
force-pushed
the
feature/dynamic-retrieval-of-source-directory-names
branch
from
371c551 to
2edd8fe
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the file-resolution logic to dynamically retrieve the source and resource directory paths from each module’s configuration, instead of using hard-coded values. Also include test source and test resource directories, and limit the DAO/SQL file search scope to the module.