Skip to content

Commit e8ced49

Browse files
mdddjmdddj
authored
Merge pull request #25 from mdddj/3.3.2.as
3.3.2.as
2 parents 81162f4 + 381edfd commit e8ced49

39 files changed

Lines changed: 697 additions & 507 deletions

‎.fleet/run.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"configurations": [
3+
4+
]
5+
}

‎.fleet/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"backend.maxHeapSizeMb": 1500
3+
}

‎build.gradle.kts‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("org.jetbrains.intellij") version "1.13.3"
44
}
55
group = "shop.itbug"
6-
version = "3.3.2"
6+
version = "3.3.3.as"
77
repositories {
88
mavenCentral()
99
google()
@@ -14,16 +14,17 @@ repositories {
1414
}
1515

1616

17+
1718
intellij {
18-
version.set("2023.1")
19-
type.set("IC")
19+
version.set("2022.2.1.18")
20+
type.set("AI")
2021
plugins.set(
2122
listOf(
2223
"yaml",
23-
"Dart:231.8109.91",
24-
"io.flutter:73.0.4",
25-
"markdown",
26-
"terminal"
24+
"Dart:222.4582",
25+
"io.flutter:73.0.2",
26+
"org.intellij.plugins.markdown",
27+
"terminal", "java"
2728
)
2829
)
2930
}
@@ -126,14 +127,23 @@ tasks {
126127
}
127128

128129
patchPluginXml {
129-
sinceBuild.set("231")
130-
untilBuild.set("231.*")
130+
sinceBuild.set("222")
131+
untilBuild.set("222.*")
131132
changeNotes.set(
132133
"""
133134
<div>
134-
<h1>3.3.2</h1>
135+
<h1>3.3.3.as</h1>
136+
<ul>
137+
<li>Optimize the Dio request window tool</li>
138+
<li>freezed class model add <pre>ff</pre> command，Quickly generate the from Json function </li>
139+
<img src='https://github.com/mdddj/dd_flutter_idea_plugin/blob/3.3.2.as/images/freezed_ff.png?raw=true' />
140+
</ul>
141+
</div>
142+
<div>
143+
<h1>3.3.2.as</h1>
135144
<ul>
136145
<li>Optimize the Dio request window tool</li>
146+
<li>OpenAI function removal</li>
137147
</ul>
138148
</div>
139149

‎images/freezed_ff.png‎

29.8 KB
Loading

‎src/main/kotlin/note/jdbc/FlutterCollectService.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,22 @@ object FlutterCollectService {
124124
select * from ${SqliteConnectManager.FlutterPluginTableName}
125125
""".trimIndent()
126126
val query = SqlExecutor.query(SqliteConnectManager.connect, sql, EntityListHandler())
127-
println(query.size)
128127
list = query.toList()
129128
}
130129
return list
131130

132131
}
133132

133+
134+
135+
136+
///禁用检查
137+
fun disableCheckPlugin( pluginName: String,check: Boolean) {
138+
check {
139+
val sql = """
140+
141+
""".trimIndent()
142+
}
143+
}
144+
134145
}

‎src/main/kotlin/shop/itbug/fluttercheckversionx/actions/ApiCopyAll.kt‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,28 @@ import shop.itbug.fluttercheckversionx.document.copyTextToClipboard
99
class ApiCopyAll:MyAction({"Copy All"}) {
1010
override fun actionPerformed(e: AnActionEvent) {
1111
val api = e.api()!!
12-
val dataMap = mapOf(
12+
val dataMap = mutableMapOf(
1313
"url" to api.url,
1414
"method" to api.method,
1515
"headers" to api.headers,
16-
"queryParams" to api.queryParams,
17-
"bodyJsonObject" to api.body,
18-
"statusCode" to api.statusCode,
19-
"body" to api.body,
20-
"requestTime" to api.createDate,
21-
"timestamp" to api.timestamp
2216
)
17+
18+
api.queryParams?.apply {
19+
if(this.isNotEmpty()){
20+
dataMap["queryParams"] = this
21+
}
22+
}
23+
api.body?.apply {
24+
if(this is Map<*, *> && this.isNotEmpty()){
25+
dataMap["body"] = this
26+
}
27+
}
28+
29+
dataMap["responseStatusCode"] = api.statusCode
30+
dataMap["response"] = api.getDataJson()
31+
dataMap["requestTime"] = api.createDate
32+
dataMap["timestamp"] = api.timestamp
33+
2334
val toJSONString = JSON.toJSONString(dataMap, JSONWriter.Feature.PrettyFormat)
2435
toJSONString.copyTextToClipboard()
2536
}

‎src/main/kotlin/shop/itbug/fluttercheckversionx/actions/DartAiSwitchAction.kt‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
package shop.itbug.fluttercheckversionx.actions
2-
3-
import com.intellij.openapi.actionSystem.ActionManager
4-
import com.intellij.openapi.actionSystem.AnAction
5-
import com.intellij.openapi.actionSystem.AnActionEvent
6-
import com.intellij.openapi.fileEditor.FileEditorManager
7-
import com.intellij.util.indexing.FileBasedIndex
8-
import shop.itbug.fluttercheckversionx.common.MyToggleAction
9-
import shop.itbug.fluttercheckversionx.inlay.DartAISetting
10-
11-
/**
12-
* dart 文件的ai设定
13-
*/
14-
class DartAiSwitchAction : MyToggleAction({ "Display AI operations" }) {
15-
16-
val setting = DartAISetting.getInstance()
17-
18-
override fun isSelected(e: AnActionEvent): Boolean {
19-
return setting.state.showInEditor
20-
}
21-
22-
override fun setSelected(e: AnActionEvent, state: Boolean) {
23-
println("进来了...")
24-
setting.loadState(setting.state.copy(showInEditor = state))
25-
26-
val file = FileEditorManager.getInstance(e.project!!).selectedEditor?.file!!
27-
28-
FileBasedIndex.getInstance().requestReindex(file)
29-
}
30-
31-
32-
override fun update(e: AnActionEvent) {
33-
val file = FileEditorManager.getInstance(e.project!!).selectedEditor?.file
34-
e.presentation.isEnabled = e.project!=null && file != null
35-
super.update(e)
36-
}
37-
38-
companion object {
39-
fun getInstance(): AnAction = ActionManager.getInstance().getAction("DartAiSwitchAction")!!
40-
}
41-
}
1+
//package shop.itbug.fluttercheckversionx.actions
2+
//
3+
//import com.intellij.openapi.actionSystem.ActionManager
4+
//import com.intellij.openapi.actionSystem.AnAction
5+
//import com.intellij.openapi.actionSystem.AnActionEvent
6+
//import com.intellij.openapi.fileEditor.FileEditorManager
7+
//import com.intellij.util.indexing.FileBasedIndex
8+
//import shop.itbug.fluttercheckversionx.common.MyToggleAction
9+
//import shop.itbug.fluttercheckversionx.inlay.DartAISetting
10+
//
11+
///**
12+
// * dart 文件的ai设定
13+
// */
14+
//class DartAiSwitchAction : MyToggleAction({ "Display AI operations" }) {
15+
//
16+
// val setting = DartAISetting.getInstance()
17+
//
18+
// override fun isSelected(e: AnActionEvent): Boolean {
19+
// return setting.state.showInEditor
20+
// }
21+
//
22+
// override fun setSelected(e: AnActionEvent, state: Boolean) {
23+
// println("进来了...")
24+
// setting.loadState(setting.state.copy(showInEditor = state))
25+
//
26+
// val file = FileEditorManager.getInstance(e.project!!).selectedEditor?.file!!
27+
//
28+
// FileBasedIndex.getInstance().requestReindex(file)
29+
// }
30+
//
31+
//
32+
// override fun update(e: AnActionEvent) {
33+
// val file = FileEditorManager.getInstance(e.project!!).selectedEditor?.file
34+
// e.presentation.isEnabled = e.project!=null && file != null
35+
// super.update(e)
36+
// }
37+
//
38+
// companion object {
39+
// fun getInstance(): AnAction = ActionManager.getInstance().getAction("DartAiSwitchAction")!!
40+
// }
41+
//}

‎src/main/kotlin/shop/itbug/fluttercheckversionx/actions/DioWindowAnActionEx.kt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
package shop.itbug.fluttercheckversionx.actions
22

3+
import com.alibaba.fastjson2.JSON
34
import com.intellij.openapi.actionSystem.AnActionEvent
45
import com.intellij.openapi.actionSystem.DataKey
56
import com.intellij.openapi.project.Project
67
import shop.itbug.fluttercheckversionx.form.components.ApiListPanel
78
import shop.itbug.fluttercheckversionx.form.socket.Request
89

10+
11+
fun Request.getDataJson() : Any {
12+
if(data is Map<*, *>) {
13+
return data
14+
}
15+
if(data is String && JSON.isValid(data)) {
16+
return JSON.parse(data)
17+
}
18+
return data ?: ""
19+
}
20+
921
fun AnActionEvent.api(): Request? {
1022
return getData(DataKey.create(ApiListPanel.SELECT_KEY))
1123
}

‎src/main/kotlin/shop/itbug/fluttercheckversionx/actions/MoveClassToOtherFile.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
88
import com.intellij.openapi.project.Project
99
import com.intellij.openapi.roots.ProjectRootManager
1010
import com.intellij.psi.PsiElement
11-
import com.intellij.ui.dsl.builder.Align
1211
import com.intellij.ui.dsl.builder.bindSelected
1312
import com.intellij.ui.dsl.builder.panel
1413
import com.jetbrains.lang.dart.psi.impl.DartClassDefinitionImpl
@@ -56,7 +55,7 @@ class MoveClassToOtherFile : MyAction({ "将类转移到其他文件" }) {
5655
row ("转移到文件") {
5756
textFieldWithBrowseButton("选择文件",project, FileChooserDescriptorFactory.createSingleFileDescriptor("dart").withRoots(
5857
ProjectRootManager.getInstance(project).contentSourceRoots.first()
59-
)).align(Align.FILL)
58+
))
6059
}
6160
row ("转移的类") {
6261
label(psiElement.name?:"...?")

‎src/main/kotlin/shop/itbug/fluttercheckversionx/activity/FlutterProjectOpenActivity.kt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package shop.itbug.fluttercheckversionx.activity
33
import com.intellij.openapi.Disposable
44
import com.intellij.openapi.application.ApplicationManager
55
import com.intellij.openapi.project.Project
6-
import com.intellij.openapi.startup.ProjectActivity
6+
import com.intellij.openapi.startup.StartupActivity
77
import com.intellij.openapi.vfs.VirtualFile
88
import com.intellij.openapi.vfs.VirtualFileManager
99
import com.intellij.openapi.vfs.newvfs.BulkFileListener
@@ -17,7 +17,7 @@ import shop.itbug.fluttercheckversionx.util.MyDartPsiElementUtil
1717
* 当项目打开的时候,会执行这个类的runActivity方法
1818
* 在这里启动一个子线程去检测项目中的pubspec.yaml文件.并执行检测新版本
1919
*/
20-
class FlutterProjectOpenActivity : ProjectActivity, Disposable {
20+
class FlutterProjectOpenActivity : StartupActivity, Disposable {
2121

2222
/**
2323
* 项目在idea中打开时执行函数
@@ -39,7 +39,7 @@ class FlutterProjectOpenActivity : ProjectActivity, Disposable {
3939

4040
}
4141

42-
override suspend fun execute(project: Project) {
42+
fun execute(project: Project) {
4343
///监听assets资源目录更改事件
4444
ApplicationManager.getApplication().messageBus.connect(this).subscribe(VirtualFileManager.VFS_CHANGES, object :
4545
BulkFileListener {
@@ -71,4 +71,8 @@ class FlutterProjectOpenActivity : ProjectActivity, Disposable {
7171
CacheUtil.clean()
7272
}
7373

74+
override fun runActivity(p0: Project) {
75+
execute(p0)
76+
}
77+
7478
}

0 commit comments

Comments
 (0)