Minor fixes

Author: InSyncWithFoo

src/main/kotlin/insyncwithfoo/ryecharm/Project.kt

@@ -76,7 +76,7 @@ private val Project.pythonSDK: Sdk?
  * @see isUV
  */
 internal val Project.sdkIsUV: Boolean
-    get() = pythonSDK?.isUV == true
+    get() = pythonSDK?.isUV == true || modules.singleOrNull()?.sdkIsUV == true
 
 
 internal val Project.path: Path?

src/main/kotlin/insyncwithfoo/ryecharm/configurations/main/Configurations.kt

@@ -8,6 +8,9 @@ import insyncwithfoo.ryecharm.configurations.SettingName
 internal class MainConfigurations : DisplayableState() {
     var languageInjectionPEP723Blocks by property(true)
     var languageInjectionRequirements by property(true)
+    
+    var suppressIncorrectNIRI by property(true)
+    var suppressIncorrectNIRINonUVSDK by property(false)
 }
 
 

src/main/kotlin/insyncwithfoo/ryecharm/configurations/main/Panels.kt

@@ -26,6 +26,14 @@ private fun Row.languageInjectionRequirementsInput(block: Cell<JBCheckBox>.() ->
     checkBox(message("configurations.main.languageInjectionRequirements.label")).apply(block)
 
 
+private fun Row.suppressIncorrectNIRIInput(block: Cell<JBCheckBox>.() -> Unit) =
+    checkBox(message("configurations.main.suppressIncorrectNIRI.label")).apply(block)
+
+
+private fun Row.suppressIncorrectNIRINonUVSDKInput(block: Cell<JBCheckBox>.() -> Unit) =
+    checkBox(message("configurations.main.suppressIncorrectNIRINonUVSDK.label")).apply(block)
+
+
 @Suppress("DialogTitleCapitalization")
 private fun MainPanel.makeComponent() = panel {
     group(message("configurations.main.groups.languageInjection")) {
@@ -38,6 +46,19 @@ private fun MainPanel.makeComponent() = panel {
             overrideCheckbox(state::languageInjectionRequirements)
         }
     }
+    
+    group(message(message("configurations.main.groups.inspections"))) {
+        row {
+            suppressIncorrectNIRIInput { bindSelected(state::suppressIncorrectNIRI) }
+            overrideCheckbox(state::suppressIncorrectNIRI)
+        }
+        indent {
+            row {
+                suppressIncorrectNIRINonUVSDKInput { bindSelected(state::suppressIncorrectNIRINonUVSDK) }
+                overrideCheckbox(state::suppressIncorrectNIRINonUVSDK)
+            }
+        }
+    }
 }
 
 

src/main/kotlin/insyncwithfoo/ryecharm/configurations/uv/Configurations.kt

@@ -29,8 +29,6 @@ internal class UVConfigurations : DisplayableState() {
 
     var retrieveDependenciesInReadAction by property(false)
     var dependenciesDataMaxAge by property(5)
-    var suppressIncorrectNIRI by property(true)
-    var suppressIncorrectNIRINonUVSDK by property(false)
 }
 
 

src/main/kotlin/insyncwithfoo/ryecharm/configurations/uv/Panels.kt

@@ -73,14 +73,6 @@ private fun Row.dependenciesDataMaxAgeInput(block: Cell<JBIntSpinner>.() -> Unit
     spinner(0..1_000_000).apply(block)
 
 
-private fun Row.suppressIncorrectNIRIInput(block: Cell<JBCheckBox>.() -> Unit) =
-    checkBox(message("configurations.uv.suppressIncorrectNIRI.label")).apply(block)
-
-
-private fun Row.suppressIncorrectNIRINonUVSDKInput(block: Cell<JBCheckBox>.() -> Unit) =
-    checkBox(message("configurations.uv.suppressIncorrectNIRINonUVSDK.label")).apply(block)
-
-
 @Suppress("DialogTitleCapitalization")
 private fun UVPanel.makeComponent() = panel {
 
@@ -144,17 +136,6 @@ private fun UVPanel.makeComponent() = panel {
             dependenciesDataMaxAgeInput { bindIntValue(state::dependenciesDataMaxAge) }
             overrideCheckbox(state::dependenciesDataMaxAge)
         }
-        
-        row {
-            suppressIncorrectNIRIInput { bindSelected(state::suppressIncorrectNIRI) }
-            overrideCheckbox(state::suppressIncorrectNIRI)
-        }
-        indent {
-            row {
-                suppressIncorrectNIRINonUVSDKInput { bindSelected(state::suppressIncorrectNIRINonUVSDK) }
-                overrideCheckbox(state::suppressIncorrectNIRINonUVSDK)
-            }
-        }
     }
 
 }

…isfiedRequirementInspectionSuppressor.kt …isfiedRequirementInspectionSuppressor.ktsrc/main/kotlin/insyncwithfoo/ryecharm/uv/suppressors/UnsatisfiedRequirementInspectionSuppressor.kt renamed to src/main/kotlin/insyncwithfoo/ryecharm/others/suppressors/UnsatisfiedRequirementInspectionSuppressor.kt src/main/kotlin/insyncwithfoo/ryecharm/uv/suppressors/UnsatisfiedRequirementInspectionSuppressor.kt renamed to src/main/kotlin/insyncwithfoo/ryecharm/others/suppressors/UnsatisfiedRequirementInspectionSuppressor.kt

@@ -1,5 +1,4 @@
-package insyncwithfoo.ryecharm.uv.suppressors
-
+package insyncwithfoo.ryecharm.others.suppressors
 
 import com.intellij.codeInspection.InspectionSuppressor
 import com.intellij.codeInspection.SuppressQuickFix
@@ -8,7 +7,7 @@ import com.intellij.psi.PsiElement
 import com.jetbrains.python.requirements.inspections.tools.NotInstalledRequirementInspection
 import insyncwithfoo.ryecharm.TOMLPath
 import insyncwithfoo.ryecharm.absoluteName
-import insyncwithfoo.ryecharm.configurations.uv.uvConfigurations
+import insyncwithfoo.ryecharm.configurations.main.mainConfigurations
 import insyncwithfoo.ryecharm.isPyprojectToml
 import insyncwithfoo.ryecharm.sdkIsUV
 import insyncwithfoo.ryecharm.stringArrayTomlKey
@@ -31,7 +30,7 @@ internal class UnsatisfiedRequirementInspectionSuppressor : InspectionSuppressor
         }
 
         val (project, file) = Pair(element.project, element.containingFile.virtualFile)
-        val configurations = project.uvConfigurations
+        val configurations = project.mainConfigurations
 
         when {
             !file.isPyprojectToml -> return false

src/main/resources/META-INF/others.xml

@@ -81,6 +81,12 @@
 			language="TOML"
 			implementationClass="insyncwithfoo.ryecharm.others.installers.GutterInstallButtonsProvider"
 		/>
+		
+		<lang.inspectionSuppressor
+			id="insyncwithfoo.ryecharm.others.suppressors.UnsatisfiedRequirementInspectionSuppressor"
+			language="TOML"
+			implementationClass="insyncwithfoo.ryecharm.others.suppressors.UnsatisfiedRequirementInspectionSuppressor"
+		/>
 	</extensions>
 
 	<extensions defaultExtensionNs="JavaScript">

src/main/resources/META-INF/uv.xml

@@ -66,12 +66,6 @@
 			id="insyncwithfoo.ryecharm.uv.actions.Install"
 			implementation="insyncwithfoo.ryecharm.uv.actions.Install"
 		/>
-		
-		<lang.inspectionSuppressor
-			id="insyncwithfoo.ryecharm.uv.suppressors.UnsatisfiedRequirementInspectionSuppressor"
-			language="TOML"
-			implementationClass="insyncwithfoo.ryecharm.uv.suppressors.UnsatisfiedRequirementInspectionSuppressor"
-		/>
 	</extensions>
 
 	<extensions defaultExtensionNs="com.intellij">

src/main/resources/messages/ryecharm.properties

@@ -28,10 +28,17 @@ configurations.groups.advanced = Advanced settings
 configurations.main.displayName = RyeCharm
 
 configurations.main.groups.languageInjection = Language injection
+configurations.main.groups.inspections = Inspections
 
 configurations.main.languageInjectionPEP723Blocks.label = PEP 723 script metadata blocks
 configurations.main.languageInjectionRequirements.label = Requirements arrays in TOML files
 
+configurations.main.suppressIncorrectNIRI.label = \
+    <html> \
+        Suppress <code>UnsatisfiedRequirementInspection</code> for <code>build-system.requires</code> \
+    </html>
+configurations.main.suppressIncorrectNIRINonUVSDK.label = Even when the interpreter is not uv-based
+
 ######################################## endregion
 
 ######################################## region ## Ruff
@@ -154,10 +161,6 @@ configurations.uv.retrieveDependenciesInReadAction.label = \
     Retrieve data for computing dependency version inlay hints in read action
 configurations.uv.dependenciesDataMaxAge.label = Dependencies data's max age (seconds):
 
-configurations.uv.suppressIncorrectNIRI.label = \
-    Suppress <code>UnsatisfiedRequirementInspection</code> for <code>build-system.requires</code>
-configurations.uv.suppressIncorrectNIRINonUVSDK.label = Even when the SDK is not uv-based
-
 ######################################## endregion
 
 ######################################## region ## ty

src/test/kotlin/insyncwithfoo/ryecharm/configurations/main/MainConfigurationsTest.kt

@@ -11,9 +11,12 @@ internal class MainConfigurationsTest : ConfigurationsTest<MainConfigurations>()
 
     @Test
     fun `test shape`() {
-        doShapeTest(expectedSize = 2) {
+        doShapeTest(expectedSize = 4) {
             assertEquals(true, languageInjectionPEP723Blocks)
             assertEquals(true, languageInjectionRequirements)
+            
+            assertEquals(true, suppressIncorrectNIRI)
+            assertEquals(false, suppressIncorrectNIRINonUVSDK)
         }
     }