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

more config file extensions #98

Merged
merged 3 commits into from
Sep 20, 2023
Merged

more config file extensions #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32d5ff0
more config file extensions
asinbow Aug 23, 2023
1e0b41a
Merge branch 'main' into hao/config-extensions
aviramha Sep 20, 2023
9014c88
add changelog
aviramha Sep 20, 2023
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
1 change: 1 addition & 0 deletions changelog.d/+support-yaml-and-toml.added.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for TOML and YAML mirrord configuration files
2 changes: 1 addition & 1 deletion modules/core/src/main/kotlin/com/metalbear/mirrord/MirrordConfigAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class MirrordConfigAPI(private val service: MirrordProjectService) {
fun getDefaultConfig(): VirtualFile? {
return getMirrordDir()
?.children
?.filter { it.name.endsWith("mirrord.json") }
?.filter { it.name.endsWith("mirrord.json") || it.name.endsWith("mirrord.yaml") || it.name.endsWith("mirrord.toml") }
?.minByOrNull { it.name }
}

Expand Down
6 changes: 5 additions & 1 deletion modules/core/src/main/kotlin/com/metalbear/mirrord/MirrordDropDown.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ class MirrordConfigIndex : ScalarIndexExtension<String>() {

override fun getInputFilter(): FileBasedIndex.InputFilter {
return FileBasedIndex.InputFilter {
it.isInLocalFileSystem && !it.isDirectory && it.path.endsWith("mirrord.json")
it.isInLocalFileSystem && !it.isDirectory && (
it.path.endsWith("mirrord.json") ||
it.path.endsWith("mirrord.yaml") ||
it.path.endsWith("mirrord.toml")
)
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/META-INF/mirrord-maven.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<runConfigurationExtension implementation="com.metalbear.mirrord.products.idea.IdeaRunConfigurationExtension" id="mirrordIdea"/>
<executionEnvironmentProvider implementation="com.metalbear.mirrord.products.idea.MavenRunConfigurationExtension"/>
</extensions>
</idea-plugin>