Merge pull request #122 from SysBind/v1.2.9

V1.2.9

Author: AviMoto

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
 ## [Unreleased]
 
+## [1.2.9]
+
+### Added
+
+- Auto complete to Database object dependency injection
+- Add Moodle directory to PHP include path
+
 ## [1.2.8] - 2024-08-14
 
 ### Changed

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = il.co.sysbind.moodledev
 pluginName = moodle-dev
 pluginRepositoryUrl = https://github.com/SysBind/moodle-dev
 # SemVer format -> https://semver.org
-pluginVersion = 1.2.8
+pluginVersion = 1.2.9
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233

src/main/kotlin/il/co/sysbind/moodledev/MoodleBundle.kt

@@ -1,21 +1,20 @@
 package il.co.sysbind.moodledev
 
-import com.intellij.AbstractBundle
+import com.intellij.DynamicBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
 
 @NonNls
 private const val BUNDLE = "messages.MoodleBundle"
 
-object MoodleBundle : AbstractBundle(BUNDLE) {
+object MoodleBundle : DynamicBundle(BUNDLE) {
 
-    @Suppress("SpreadOperator")
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = getMessage(key, *params)
+    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) =
+        getMessage(key, *params)
 
-    @Suppress("SpreadOperator")
+    @Suppress("unused")
     @JvmStatic
-    fun messagePointer(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = run {
-        message(key, *params)
-    }
+    fun messagePointer(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) =
+        getLazyMessage(key, *params)
 }

src/main/kotlin/il/co/sysbind/moodledev/project/MoodleSettingsForm.kt

@@ -8,6 +8,7 @@ import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.*
+import com.jetbrains.php.config.library.PhpIncludePathManager
 import com.jetbrains.php.frameworks.PhpFrameworkConfigurable
 import com.jetbrains.php.lang.PhpLanguage
 import il.co.sysbind.moodledev.MoodleBundle
@@ -71,12 +72,32 @@ class MoodleSettingsForm(val project: Project) : PhpFrameworkConfigurable {
         } else {
             settings.moodlePath = project.guessProjectDir()?.path ?: ""
         }
+        val moodlePathStr = settings.moodlePath
         if (isBeingUsed) {
             val codeStyleSettings = CodeStyle.getSettings(project)
             MoodlePhpPredefinedCodeStyle().apply(codeStyleSettings, PhpLanguage.INSTANCE)
             MoodleJavascriptPredefinedCodeStyle().apply(codeStyleSettings, JavascriptLanguage.INSTANCE)
             MoodleLessPredefinedCodeStyle().apply(codeStyleSettings, LESSLanguage.INSTANCE)
             MoodleScssPredefinedCodeStyle().apply(codeStyleSettings, SCSSLanguage.INSTANCE)
+            if (settings.moodlePath.isNotBlank()) {
+                // Get the PhpIncludePathManager for the current project
+                val includePathManager = PhpIncludePathManager.getInstance(project)
+                // Add the Moodle path to the PHP include paths
+                val includePathList = includePathManager.includePath
+                if (!includePathList.contains(moodlePathStr)) {
+                    includePathList.add(moodlePathStr)
+                    includePathManager.includePath = includePathList
+                }
+            }
+        } else {
+            if (moodlePathStr.isNotBlank() && moodlePathStr != project.guessProjectDir()?.path) {
+                val includePathManager = PhpIncludePathManager.getInstance(project)
+                val includePathList = includePathManager.includePath
+                if (includePathList.contains(moodlePathStr)) {
+                    includePathList.remove(moodlePathStr)
+                    includePathManager.includePath = includePathList
+                }
+            }
         }
     }
 

src/main/resources/liveTemplates/Moodle.xml

@@ -9,4 +9,9 @@
       <option name="PHP" value="true" />
     </context>
   </template>
+  <template name="didb" value="protected readonly \moodle_database $db," description="Use dependency injection of global $DB" toReformat="false" toShortenFQNames="true">
+    <context>
+      <option name="PHP" value="true" />
+    </context>
+  </template>
 </templateSet>