proper plugin structure, convert to kts

nextras · May 5, 2021 · 2b35c81 · 2b35c81
1 parent 7b1e0fa
commit 2b35c81
Show file tree

Hide file tree

Showing 50 changed files with 114 additions and 152 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+	<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
+		<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
+		<ExternalSystemSettings>
+			<option name="executionName" />
+			<option name="externalProjectPath" value="$PROJECT_DIR$" />
+			<option name="externalSystemIdString" value="GRADLE" />
+			<option name="scriptParameters" value="" />
+			<option name="taskDescriptions">
+				<list />
+			</option>
+			<option name="taskNames">
+				<list>
+					<option value="runIde" />
+				</list>
+			</option>
+			<option name="vmOptions" value="" />
+		</ExternalSystemSettings>
+		<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+		<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+		<DebugAllEnabled>false</DebugAllEnabled>
+		<method v="2" />
+	</configuration>
+</component>
diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Plugin Tests.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+	<configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
+		<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
+		<ExternalSystemSettings>
+			<option name="executionName" />
+			<option name="externalProjectPath" value="$PROJECT_DIR$" />
+			<option name="externalSystemIdString" value="GRADLE" />
+			<option name="scriptParameters" value="" />
+			<option name="taskDescriptions">
+				<list />
+			</option>
+			<option name="taskNames">
+				<list>
+					<option value="check" />
+				</list>
+			</option>
+			<option name="vmOptions" value="" />
+		</ExternalSystemSettings>
+		<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+		<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+		<DebugAllEnabled>false</DebugAllEnabled>
+		<method v="2" />
+	</configuration>
+</component>
diff --git a/.run/Run Plugin Verification.run.xml b/.run/Run Plugin Verification.run.xml
@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+	<configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
+		<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
+		<ExternalSystemSettings>
+			<option name="executionName" />
+			<option name="externalProjectPath" value="$PROJECT_DIR$" />
+			<option name="externalSystemIdString" value="GRADLE" />
+			<option name="scriptParameters" value="" />
+			<option name="taskDescriptions">
+				<list />
+			</option>
+			<option name="taskNames">
+				<list>
+					<option value="runPluginVerifier" />
+				</list>
+			</option>
+			<option name="vmOptions" value="" />
+		</ExternalSystemSettings>
+		<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+		<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+		<DebugAllEnabled>false</DebugAllEnabled>
+		<method v="2">
+			<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
+		</method>
+	</configuration>
+</component>
diff --git a/build.gradle b/build.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,37 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+	id("org.jetbrains.kotlin.jvm") version "1.5.0"
+	id("org.jetbrains.intellij") version "0.7.3"
+	id("org.jetbrains.changelog") version "1.1.2"
+}
+
+group = "org.nextras.orm.intellij"
+version = "0.7.1"
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+}
+
+intellij {
+	pluginName = "Nextras Orm Plugin"
+	version = "2020.1"
+	updateSinceUntilBuild = false
+	downloadSources = true
+	alternativeIdePath = "C:\\dev\\jetbrains\\apps\\PhpStorm\\ch-0\\211.7142.44\\"
+	setPlugins("com.jetbrains.php:201.6668.153")
+}
+
+tasks {
+	withType<JavaCompile> {
+		sourceCompatibility = "1.8"
+		targetCompatibility = "1.8"
+	}
+	withType<KotlinCompile> {
+		kotlinOptions.jvmTarget = "1.8"
+	}
+}
diff --git a/settings.gradle b/settings.gradle
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "orm-intellij"
diff --git a/...tions/generation/GenerateActionHandler.kt → ...tions/generation/GenerateActionHandler.kt b/...tions/generation/GenerateActionHandler.kt → ...tions/generation/GenerateActionHandler.kt
diff --git a/...tions/generation/GenerateGettersAction.kt → ...tions/generation/GenerateGettersAction.kt b/...tions/generation/GenerateGettersAction.kt → ...tions/generation/GenerateGettersAction.kt
diff --git a/...eneration/GenerateGettersSettersAction.kt → ...eneration/GenerateGettersSettersAction.kt b/...eneration/GenerateGettersSettersAction.kt → ...eneration/GenerateGettersSettersAction.kt
diff --git a/...tions/generation/GenerateSettersAction.kt → ...tions/generation/GenerateSettersAction.kt b/...tions/generation/GenerateSettersAction.kt → ...tions/generation/GenerateSettersAction.kt
diff --git a/...annotator/ModifierHighlighterAnnotator.kt → ...annotator/ModifierHighlighterAnnotator.kt b/...annotator/ModifierHighlighterAnnotator.kt → ...annotator/ModifierHighlighterAnnotator.kt
diff --git a/...otator/highlighter/ModifierHighlighter.kt → ...otator/highlighter/ModifierHighlighter.kt b/...otator/highlighter/ModifierHighlighter.kt → ...otator/highlighter/ModifierHighlighter.kt
diff --git a/...ighlighter/ModifierHighlighterSettings.kt → ...ighlighter/ModifierHighlighterSettings.kt b/...ighlighter/ModifierHighlighterSettings.kt → ...ighlighter/ModifierHighlighterSettings.kt
diff --git a/...ij/completion/EntityPropertiesProvider.kt → ...ij/completion/EntityPropertiesProvider.kt b/...ij/completion/EntityPropertiesProvider.kt → ...ij/completion/EntityPropertiesProvider.kt
diff --git a/...ellij/completion/ModifierInsertHandler.kt → ...ellij/completion/ModifierInsertHandler.kt b/...ellij/completion/ModifierInsertHandler.kt → ...ellij/completion/ModifierInsertHandler.kt
diff --git a/.../intellij/completion/ModifiersPatterns.kt → .../intellij/completion/ModifiersPatterns.kt b/.../intellij/completion/ModifiersPatterns.kt → .../intellij/completion/ModifiersPatterns.kt
diff --git a/.../intellij/completion/ModifiersProvider.kt → .../intellij/completion/ModifiersProvider.kt b/.../intellij/completion/ModifiersProvider.kt → .../intellij/completion/ModifiersProvider.kt
diff --git a/...ij/completion/OrmCompletionContributor.kt → ...ij/completion/OrmCompletionContributor.kt b/...ij/completion/OrmCompletionContributor.kt → ...ij/completion/OrmCompletionContributor.kt
diff --git a/...pletion/PropertyNameCompletionProvider.kt → ...pletion/PropertyNameCompletionProvider.kt b/...pletion/PropertyNameCompletionProvider.kt → ...pletion/PropertyNameCompletionProvider.kt
diff --git a/...ion/SetReadOnlyValueCompletionProvider.kt → ...ion/SetReadOnlyValueCompletionProvider.kt b/...ion/SetReadOnlyValueCompletionProvider.kt → ...ion/SetReadOnlyValueCompletionProvider.kt
diff --git a/.../inspection/ReadOnlyPropertyInspection.kt → .../inspection/ReadOnlyPropertyInspection.kt b/.../inspection/ReadOnlyPropertyInspection.kt → .../inspection/ReadOnlyPropertyInspection.kt
diff --git a/...r/RepositoryMapperMethodMarkerProvider.kt → ...r/RepositoryMapperMethodMarkerProvider.kt b/...r/RepositoryMapperMethodMarkerProvider.kt → ...r/RepositoryMapperMethodMarkerProvider.kt
diff --git a/...lij/reference/CollectionClassReference.kt → ...lij/reference/CollectionClassReference.kt b/...lij/reference/CollectionClassReference.kt → ...lij/reference/CollectionClassReference.kt
diff --git a/.../reference/CollectionPropertyReference.kt → .../reference/CollectionPropertyReference.kt b/.../reference/CollectionPropertyReference.kt → .../reference/CollectionPropertyReference.kt
diff --git a/...ce/CollectionPropertyReferenceProvider.kt → ...ce/CollectionPropertyReferenceProvider.kt b/...ce/CollectionPropertyReferenceProvider.kt → ...ce/CollectionPropertyReferenceProvider.kt
diff --git a/...llij/reference/EntityPropertyReference.kt → ...llij/reference/EntityPropertyReference.kt b/...llij/reference/EntityPropertyReference.kt → ...llij/reference/EntityPropertyReference.kt
diff --git a/...m/intellij/reference/ModifierClassName.kt → ...m/intellij/reference/ModifierClassName.kt b/...m/intellij/reference/ModifierClassName.kt → ...m/intellij/reference/ModifierClassName.kt
diff --git a/...ij/reference/ModifierClassNameProvider.kt → ...ij/reference/ModifierClassNameProvider.kt b/...ij/reference/ModifierClassNameProvider.kt → ...ij/reference/ModifierClassNameProvider.kt
diff --git a/...tellij/reference/ModifierClassProperty.kt → ...tellij/reference/ModifierClassProperty.kt b/...tellij/reference/ModifierClassProperty.kt → ...tellij/reference/ModifierClassProperty.kt
diff --git a/...eference/ModifierClassPropertyProvider.kt → ...eference/ModifierClassPropertyProvider.kt b/...eference/ModifierClassPropertyProvider.kt → ...eference/ModifierClassPropertyProvider.kt
diff --git a/...llij/reference/OrmReferenceContributor.kt → ...llij/reference/OrmReferenceContributor.kt b/...llij/reference/OrmReferenceContributor.kt → ...llij/reference/OrmReferenceContributor.kt
diff --git a/...eference/PropertyNameReferenceProvider.kt → ...eference/PropertyNameReferenceProvider.kt b/...eference/PropertyNameReferenceProvider.kt → ...eference/PropertyNameReferenceProvider.kt
diff --git a/...m/intellij/reference/ReferenceSearcher.kt → ...m/intellij/reference/ReferenceSearcher.kt b/...m/intellij/reference/ReferenceSearcher.kt → ...m/intellij/reference/ReferenceSearcher.kt
diff --git a/...ij/typeProvider/CollectionTypeProvider.kt → ...ij/typeProvider/CollectionTypeProvider.kt b/...ij/typeProvider/CollectionTypeProvider.kt → ...ij/typeProvider/CollectionTypeProvider.kt
diff --git a/...rovider/PersistenceMethodsTypeProvider.kt → ...rovider/PersistenceMethodsTypeProvider.kt b/...rovider/PersistenceMethodsTypeProvider.kt → ...rovider/PersistenceMethodsTypeProvider.kt
@@ -22,7 +22,7 @@ class PersistenceMethodsTypeProvider : PhpTypeProvider4 {
 		}
 
 		//cannot access index here, so just dummy check
-		val className = element.classReference!!.name!!.toLowerCase()
+		val className = element.classReference!!.name!!.lowercase()
 		if (!className.endsWith("model") && !className.endsWith("repository") && !className.endsWith("repositorycontainer")) {
 			return null
 		}

diff --git a/...rg/nextras/orm/intellij/utils/OrmUtils.kt → ...rg/nextras/orm/intellij/utils/OrmUtils.kt b/...rg/nextras/orm/intellij/utils/OrmUtils.kt → ...rg/nextras/orm/intellij/utils/OrmUtils.kt
diff --git a/...xtras/orm/intellij/utils/PhpIndexUtils.kt → ...xtras/orm/intellij/utils/PhpIndexUtils.kt b/...xtras/orm/intellij/utils/PhpIndexUtils.kt → ...xtras/orm/intellij/utils/PhpIndexUtils.kt
diff --git a/resources/META-INF/plugin.xml → src/main/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml → src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
 	<id>org.nextras.orm.intellij</id>
 	<name>Nextras Orm</name>
-	<vendor url="https://www.nextras.org">Nextras</vendor>
+	<vendor url="https://nextras.org">Nextras</vendor>
 
 	<description><![CDATA[
 		<p>Provides support for <a href="https://github.com/nextras/orm/">Nextras ORM</a> &ndash; an ORM library for PHP.</p>

diff --git a/resources/META-INF/pluginIcon.svg → src/main/resources/META-INF/pluginIcon.svg b/resources/META-INF/pluginIcon.svg → src/main/resources/META-INF/pluginIcon.svg