Skip to content

Commit 1186876

Browse files
committed
refactor(imports): update import paths to use devins package for consistency #379
1 parent 8ec506e commit 1186876

File tree

81 files changed

+307
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+307
-239
lines changed

core/src/223/main/resources/META-INF/autodev-core.xml

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,91 @@
231231
dynamic="true"
232232
/>
233233

234+
234235
<extensionPoint qualifiedName="cc.unitmesh.shireActionLocationEditor"
235-
interface="cc.unitmesh.devti.devins.ActionLocationEditor"
236+
interface="cc.unitmesh.devti.devins.provider.ActionLocationEditor"
236237
dynamic="true"/>
238+
239+
240+
<extensionPoint qualifiedName="cc.unitmesh.shireFileCreateService"
241+
beanClass="com.intellij.lang.LanguageExtensionPoint"
242+
dynamic="true">
243+
<with attribute="implementationClass" implements="cc.unitmesh.devti.devins.provider.FileCreateService"/>
244+
</extensionPoint>
245+
246+
<!-- Toolchain Provider -->
247+
<extensionPoint qualifiedName="cc.unitmesh.shireLanguageToolchainProvider"
248+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
249+
<with attribute="implementationClass"
250+
implements="cc.unitmesh.devti.devins.provider.LanguageToolchainProvider"/>
251+
</extensionPoint>
252+
253+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiVariableProvider"
254+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
255+
<with attribute="implementationClass"
256+
implements="cc.unitmesh.devti.devins.provider.PsiContextVariableProvider"/>
257+
</extensionPoint>
258+
259+
<!-- PSI Query Expression -->
260+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiQLInterpreter"
261+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
262+
<with attribute="implementationClass"
263+
implements="cc.unitmesh.devti.devins.provider.shireql.ShireQLInterpreter"/>
264+
</extensionPoint>
265+
266+
<!-- Toolchain Variable Provider -->
267+
<extensionPoint qualifiedName="cc.unitmesh.shireToolchainVariableProvider"
268+
interface="cc.unitmesh.devti.devins.provider.ToolchainVariableProvider"
269+
dynamic="true">
270+
</extensionPoint>
271+
272+
<!-- Toolchain Function Provider -->
273+
<extensionPoint qualifiedName="cc.unitmesh.shireToolchainFunctionProvider"
274+
interface="cc.unitmesh.devti.devins.provider.ToolchainFunctionProvider"
275+
dynamic="true">
276+
</extensionPoint>
277+
278+
<!-- Post Code Middleware -->
279+
<extensionPoint qualifiedName="cc.unitmesh.shirePostProcessor"
280+
interface="cc.unitmesh.devti.devins.provider.post.PostProcessor"
281+
dynamic="true"/>
282+
283+
<!-- Location Interaction -->
284+
<extensionPoint qualifiedName="cc.unitmesh.shireLocationInteraction"
285+
interface="cc.unitmesh.devti.devins.provider.LocationInteractionProvider"
286+
dynamic="true"/>
287+
288+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiCapture"
289+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
290+
<with attribute="implementationClass" implements="cc.unitmesh.devti.devins.provider.PsiCapture"/>
291+
</extensionPoint>
292+
293+
<extensionPoint qualifiedName="cc.unitmesh.shireSymbolProvider"
294+
interface="cc.unitmesh.devti.devins.provider.ShireSymbolProvider"
295+
dynamic="true"/>
296+
297+
<extensionPoint qualifiedName="cc.unitmesh.shireQLDataProvider"
298+
interface="cc.unitmesh.devti.devins.provider.ShireQLDataProvider"
299+
dynamic="true"/>
300+
301+
<extensionPoint qualifiedName="cc.unitmesh.shireRevisionProvider"
302+
interface="cc.unitmesh.devti.devins.provider.RevisionProvider"
303+
dynamic="true"/>
304+
305+
<extensionPoint qualifiedName="cc.unitmesh.shireTerminalExecutor"
306+
interface="cc.unitmesh.devti.language.provider.TerminalLocationExecutor"
307+
dynamic="true"/>
308+
309+
<extensionPoint qualifiedName="cc.unitmesh.shireHttpHandler"
310+
interface="cc.unitmesh.devti.devins.provider.http.HttpHandler"
311+
dynamic="true"/>
312+
313+
<!-- Code Complexity -->
314+
<extensionPoint qualifiedName="cc.unitmesh.shireComplexityProvider"
315+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
316+
<with attribute="implementationClass"
317+
implements="cc.unitmesh.devti.devins.provider.ComplexityProvider"/>
318+
</extensionPoint>
237319
</extensionPoints>
238320

239321
<!-- <projectListeners>-->

core/src/233/main/resources/META-INF/autodev-core.xml

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,89 @@
241241
/>
242242

243243
<extensionPoint qualifiedName="cc.unitmesh.shireActionLocationEditor"
244-
interface="cc.unitmesh.devti.devins.ActionLocationEditor"
244+
interface="cc.unitmesh.devti.devins.provider.ActionLocationEditor"
245245
dynamic="true"/>
246+
247+
248+
<extensionPoint qualifiedName="cc.unitmesh.shireFileCreateService"
249+
beanClass="com.intellij.lang.LanguageExtensionPoint"
250+
dynamic="true">
251+
<with attribute="implementationClass" implements="cc.unitmesh.devti.devins.provider.FileCreateService"/>
252+
</extensionPoint>
253+
254+
<!-- Toolchain Provider -->
255+
<extensionPoint qualifiedName="cc.unitmesh.shireLanguageToolchainProvider"
256+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
257+
<with attribute="implementationClass"
258+
implements="cc.unitmesh.devti.devins.provider.LanguageToolchainProvider"/>
259+
</extensionPoint>
260+
261+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiVariableProvider"
262+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
263+
<with attribute="implementationClass"
264+
implements="cc.unitmesh.devti.devins.provider.PsiContextVariableProvider"/>
265+
</extensionPoint>
266+
267+
<!-- PSI Query Expression -->
268+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiQLInterpreter"
269+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
270+
<with attribute="implementationClass"
271+
implements="cc.unitmesh.devti.devins.provider.shireql.ShireQLInterpreter"/>
272+
</extensionPoint>
273+
274+
<!-- Toolchain Variable Provider -->
275+
<extensionPoint qualifiedName="cc.unitmesh.shireToolchainVariableProvider"
276+
interface="cc.unitmesh.devti.devins.provider.ToolchainVariableProvider"
277+
dynamic="true">
278+
</extensionPoint>
279+
280+
<!-- Toolchain Function Provider -->
281+
<extensionPoint qualifiedName="cc.unitmesh.shireToolchainFunctionProvider"
282+
interface="cc.unitmesh.devti.devins.provider.ToolchainFunctionProvider"
283+
dynamic="true">
284+
</extensionPoint>
285+
286+
<!-- Post Code Middleware -->
287+
<extensionPoint qualifiedName="cc.unitmesh.shirePostProcessor"
288+
interface="cc.unitmesh.devti.devins.provider.post.PostProcessor"
289+
dynamic="true"/>
290+
291+
<!-- Location Interaction -->
292+
<extensionPoint qualifiedName="cc.unitmesh.shireLocationInteraction"
293+
interface="cc.unitmesh.devti.devins.provider.LocationInteractionProvider"
294+
dynamic="true"/>
295+
296+
<extensionPoint qualifiedName="cc.unitmesh.shirePsiCapture"
297+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
298+
<with attribute="implementationClass" implements="cc.unitmesh.devti.devins.provider.PsiCapture"/>
299+
</extensionPoint>
300+
301+
<extensionPoint qualifiedName="cc.unitmesh.shireSymbolProvider"
302+
interface="cc.unitmesh.devti.devins.provider.ShireSymbolProvider"
303+
dynamic="true"/>
304+
305+
<extensionPoint qualifiedName="cc.unitmesh.shireQLDataProvider"
306+
interface="cc.unitmesh.devti.devins.provider.ShireQLDataProvider"
307+
dynamic="true"/>
308+
309+
<extensionPoint qualifiedName="cc.unitmesh.shireRevisionProvider"
310+
interface="cc.unitmesh.devti.devins.provider.RevisionProvider"
311+
dynamic="true"/>
312+
313+
<extensionPoint qualifiedName="cc.unitmesh.shireTerminalExecutor"
314+
interface="cc.unitmesh.devti.language.provider.TerminalLocationExecutor"
315+
dynamic="true"/>
316+
317+
<extensionPoint qualifiedName="cc.unitmesh.shireHttpHandler"
318+
interface="cc.unitmesh.devti.devins.provider.http.HttpHandler"
319+
dynamic="true"/>
320+
321+
<!-- Code Complexity -->
322+
<extensionPoint qualifiedName="cc.unitmesh.shireComplexityProvider"
323+
beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
324+
<with attribute="implementationClass"
325+
implements="cc.unitmesh.devti.devins.provider.ComplexityProvider"/>
326+
</extensionPoint>
246327
</extensionPoints>
247328

248329
<projectListeners>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.run.runner
1+
package cc.unitmesh.devti.devins
22

33
import com.intellij.openapi.util.TextRange
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.middleware.post
1+
package cc.unitmesh.devti.devins.post
22

33
import com.intellij.execution.ui.ConsoleView
44
import com.intellij.openapi.extensions.ExtensionPointName
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.middleware.post
1+
package cc.unitmesh.devti.devins.post
22

33
import com.intellij.lang.Language
44
import com.intellij.openapi.editor.Editor
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.middleware.post
1+
package cc.unitmesh.devti.devins.post
22

33
/**
44
* Post middleware actions, like

core/src/main/kotlin/cc/unitmesh/devti/devins/ActionLocationEditor.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/provider/ActionLocationEditor.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package cc.unitmesh.devti.devins
1+
package cc.unitmesh.devti.devins.provider
22

3+
import cc.unitmesh.devti.devins.ShireActionLocation
4+
import cc.unitmesh.devti.devins.VariableActionEventDataHolder
35
import com.intellij.ide.DataManager
46
import com.intellij.openapi.actionSystem.CommonDataKeys
57
import com.intellij.openapi.editor.Editor
@@ -37,7 +39,7 @@ interface ActionLocationEditor {
3739
return contextEditor
3840
}
3941

40-
val savedDataContext = VariableActionEventDataHolder.getData()?.dataContext
42+
val savedDataContext = VariableActionEventDataHolder.Companion.getData()?.dataContext
4143
val editor = savedDataContext?.getData(CommonDataKeys.EDITOR)
4244
if (editor != null) {
4345
return editor
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

3+
import cc.unitmesh.devti.devins.provider.complex.ComplexitySink
4+
import cc.unitmesh.devti.devins.provider.complex.ComplexityVisitor
35
import com.intellij.lang.Language
46
import com.intellij.lang.LanguageExtension
57
import com.intellij.psi.PsiElement
6-
import cc.unitmesh.devti.language.provider.complex.ComplexitySink
7-
import cc.unitmesh.devti.language.provider.complex.ComplexityVisitor
88

99
interface ComplexityProvider {
1010
fun process(element: PsiElement): Int
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.lang.Language
44
import com.intellij.lang.LanguageExtension
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.lang.LanguageExtension
44
import com.intellij.openapi.project.Project
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

3-
import cc.unitmesh.devti.language.run.runner.LocationInteractionContext
4-
import cc.unitmesh.devti.language.run.runner.PostFunction
3+
import cc.unitmesh.devti.devins.PostFunction
4+
import cc.unitmesh.devti.devins.provider.location.LocationInteractionContext
55
import com.intellij.openapi.extensions.ExtensionPointName
66

77
/**

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/provider/PsiCapture.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/provider/PsiCapture.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.lang.Language
44
import com.intellij.lang.LanguageExtension
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package cc.unitmesh.devti.language.ast.variable
1+
package cc.unitmesh.devti.devins.provider
22

3+
import cc.unitmesh.devti.devins.provider.psi.DefaultPsiContextVariableProvider
34
import cc.unitmesh.devti.devins.variable.PsiContextVariable
45
import cc.unitmesh.devti.devins.variable.VariableProvider
5-
import cc.unitmesh.devti.language.provider.ComplexityProvider
6-
import cc.unitmesh.devti.language.provider.LanguageToolchainProvider
7-
import cc.unitmesh.devti.language.provider.ToolchainPrepareContext
86
import cc.unitmesh.devti.provider.RevisionProvider
97
import com.intellij.lang.Language
108
import com.intellij.lang.LanguageExtension
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.codeInsight.completion.CompletionResultSet
44
import com.intellij.openapi.extensions.ExtensionPointName
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

3-
import cc.unitmesh.devti.language.ast.shireql.variable.vcs.GitEntity
4-
import cc.unitmesh.devti.language.ast.shireql.variable.vcs.ShireGitCommit
3+
import cc.unitmesh.devti.devins.provider.vcs.GitEntity
4+
import cc.unitmesh.devti.devins.provider.vcs.ShireGitCommit
55
import com.intellij.openapi.extensions.ExtensionPointName
66
import com.intellij.openapi.project.Project
77

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.codeInsight.completion.CompletionParameters
44
import com.intellij.codeInsight.completion.CompletionResultSet
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

3-
import cc.unitmesh.devti.language.provider.terminal.TerminalHandler
3+
import cc.unitmesh.devti.devins.provider.terminal.TerminalHandler
44
import com.intellij.openapi.actionSystem.AnActionEvent
55
import com.intellij.openapi.extensions.ExtensionPointName
66
import com.intellij.openapi.project.Project
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import com.intellij.openapi.extensions.ExtensionPointName
44
import com.intellij.openapi.project.Project
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider
1+
package cc.unitmesh.devti.devins.provider
22

33
import cc.unitmesh.devti.devins.variable.ToolchainVariable
44
import cc.unitmesh.devti.devins.variable.VariableProvider
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* https://github.com/nikolaikopernik/code-complexity-plugin
55
* </p>
66
*/
7-
package cc.unitmesh.devti.language.provider.complex
7+
package cc.unitmesh.devti.devins.provider.complex
88

99
data class ComplexityPoint(
1010
val complexity: Int,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* https://github.com/nikolaikopernik/code-complexity-plugin
55
* </p>
66
*/
7-
package cc.unitmesh.devti.language.provider.complex
7+
package cc.unitmesh.devti.devins.provider.complex
88

99
class ComplexitySink {
1010
private var nesting: Int = 0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* https://github.com/nikolaikopernik/code-complexity-plugin
55
* </p>
66
*/
7-
package cc.unitmesh.devti.language.provider.complex
7+
package cc.unitmesh.devti.devins.provider.complex
88

99
import com.intellij.psi.PsiElement
1010
import com.intellij.psi.PsiRecursiveElementVisitor
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider.http
1+
package cc.unitmesh.devti.devins.provider.http
22

33
import com.intellij.openapi.extensions.ExtensionPointName
44
import com.intellij.openapi.project.Project
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.run.runner
1+
package cc.unitmesh.devti.devins.provider.location
22

33
import cc.unitmesh.devti.custom.team.InteractionType
44
import cc.unitmesh.devti.devins.ShireActionLocation
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.ast.variable.psi
1+
package cc.unitmesh.devti.devins.provider.psi
22

33
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx
44
import com.intellij.lang.LanguageCommenters
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cc.unitmesh.devti.language.ast.variable
1+
package cc.unitmesh.devti.devins.provider.psi
22

3+
import cc.unitmesh.devti.devins.provider.PsiContextVariableProvider
34
import cc.unitmesh.devti.devins.variable.PsiContextVariable
4-
import cc.unitmesh.devti.language.ast.variable.psi.CodeSmellCollector
55
import com.intellij.openapi.editor.Editor
66
import com.intellij.openapi.project.Project
77
import com.intellij.psi.PsiElement
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.provider.terminal
1+
package cc.unitmesh.devti.devins.provider.terminal
22

33
import com.intellij.openapi.project.Project
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.ast.shireql.variable.vcs
1+
package cc.unitmesh.devti.devins.provider.vcs
22

33
data class ShireFileBranch(
44
val name: String,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cc.unitmesh.devti.language.ast.shireql.variable.vcs
1+
package cc.unitmesh.devti.devins.provider.vcs
22

33
data class ShireFileCommit(
44
val filename: String,

0 commit comments

Comments
 (0)