Skip to content

Commit db612e8

Browse files
committed
fix: Changed PersistenStates names to FQN of it's own class to fix conflicts with other plugins also doing it wrong.
1 parent b1a5510 commit db612e8

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

src/main/kotlin/nl/deschepers/laraveltinker/settings/GlobalSettingsState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.intellij.openapi.components.Storage
77
import com.intellij.util.xmlb.XmlSerializerUtil
88

99
@State(
10-
name = "org.intellij.sdk.settings.AppSettingsState",
10+
name = "nl.deschepers.laraveltinker.settings.AppSettingsState",
1111
storages = [Storage("laravel-tinker-plugin-settings.xml")]
1212
)
1313
class GlobalSettingsState : PersistentStateComponent<GlobalSettingsState> {

src/main/kotlin/nl/deschepers/laraveltinker/settings/ProjectSettingsState.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ package nl.deschepers.laraveltinker.settings
22

33
import com.google.gson.JsonObject
44
import com.intellij.openapi.components.PersistentStateComponent
5+
import com.intellij.openapi.components.Service
56
import com.intellij.openapi.components.State
67
import com.intellij.openapi.components.Storage
78
import com.intellij.openapi.project.Project
89
import com.intellij.util.xmlb.XmlSerializerUtil
910

11+
@Service(Service.Level.PROJECT)
1012
@State(
11-
name = "org.intellij.sdk.settings.AppSettingsState",
13+
name = "nl.deschepers.laraveltinker.settings.AppSettingsState",
1214
storages = [Storage("laravel-tinker.xml")]
1315
)
1416
class ProjectSettingsState : PersistentStateComponent<ProjectSettingsState> {

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

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
<idea-plugin>
22
<actions>
33
<group
4-
id="nl.deschepers.laraveltinker.MenuActions"
5-
icon="/icons/icon.svg"
6-
text="Laravel Tinker"
7-
description="Laravel Tinker actions"
8-
popup="true">
4+
id="nl.deschepers.laraveltinker.MenuActions"
5+
icon="/icons/icon.svg"
6+
text="Laravel Tinker"
7+
description="Laravel Tinker actions"
8+
popup="true">
99
<add-to-group anchor="last" group-id="ToolsMenu"/>
1010

1111
<action
12-
id="nl.deschepers.laraveltinker.action.SmartAction"
13-
class="nl.deschepers.laraveltinker.action.SmartAction"
14-
description="Smart action"
15-
text="Smart Action"
16-
icon="/icons/icon.svg">
12+
id="nl.deschepers.laraveltinker.action.SmartAction"
13+
class="nl.deschepers.laraveltinker.action.SmartAction"
14+
description="Smart action"
15+
text="Smart Action"
16+
icon="/icons/icon.svg">
1717
<keyboard-shortcut first-keystroke="control shift T" keymap="$default" replace-all="true"/>
1818
<keyboard-shortcut first-keystroke="control shift T" keymap="Mac OS X" replace-all="true"/>
1919
<keyboard-shortcut first-keystroke="control shift T" keymap="Mac OS X 10.5+"
20-
replace-all="true"/>
20+
replace-all="true"/>
2121
</action>
2222
<action
23-
id="nl.deschepers.laraveltinker.action.OpenNewConsoleAction"
24-
class="nl.deschepers.laraveltinker.action.OpenNewConsoleAction"
25-
description="Open new console"
26-
text="Open New Console"
27-
icon="general/add.svg">
23+
id="nl.deschepers.laraveltinker.action.OpenNewConsoleAction"
24+
class="nl.deschepers.laraveltinker.action.OpenNewConsoleAction"
25+
description="Open new console"
26+
text="Open New Console"
27+
icon="general/add.svg">
2828
</action>
2929
<action
30-
id="nl.deschepers.laraveltinker.action.OpenLastConsoleAction"
31-
class="nl.deschepers.laraveltinker.action.OpenLastConsoleAction"
32-
description="Reopen last console"
33-
text="Reopen Last Console"
34-
icon="toolwindows/toolWindowUIDesigner.svg">
30+
id="nl.deschepers.laraveltinker.action.OpenLastConsoleAction"
31+
class="nl.deschepers.laraveltinker.action.OpenLastConsoleAction"
32+
description="Reopen last console"
33+
text="Reopen Last Console"
34+
icon="toolwindows/toolWindowUIDesigner.svg">
3535
</action>
3636
<action
37-
id="nl.deschepers.laraveltinker.action.SwitchToConsoleTabAction"
38-
class="nl.deschepers.laraveltinker.action.SwitchToConsoleTabAction"
39-
description="Switch to console tab"
40-
text="Switch to Console Tab">
37+
id="nl.deschepers.laraveltinker.action.SwitchToConsoleTabAction"
38+
class="nl.deschepers.laraveltinker.action.SwitchToConsoleTabAction"
39+
description="Switch to console tab"
40+
text="Switch to Console Tab">
4141
</action>
4242
<action
43-
id="nl.deschepers.laraveltinker.action.RunConsoleAction"
44-
class="nl.deschepers.laraveltinker.action.RunConsoleAction"
45-
description="Run console"
46-
text="Run Console"
47-
icon="/icons/tinker-run.svg">
43+
id="nl.deschepers.laraveltinker.action.RunConsoleAction"
44+
class="nl.deschepers.laraveltinker.action.RunConsoleAction"
45+
description="Run console"
46+
text="Run Console"
47+
icon="/icons/tinker-run.svg">
4848
</action>
4949
<action
50-
id="nl.deschepers.laraveltinker.action.CloseAllWindowsAction"
51-
class="nl.deschepers.laraveltinker.action.CloseAllWindowsAction"
52-
description="Close all tinker windows"
53-
text="Close All Tinker Windows"
50+
id="nl.deschepers.laraveltinker.action.CloseAllWindowsAction"
51+
class="nl.deschepers.laraveltinker.action.CloseAllWindowsAction"
52+
description="Close all tinker windows"
53+
text="Close All Tinker Windows"
5454
/>
5555
</group>
5656

5757
<action id="nl.deschepers.laraveltinker.action.OpenNewConsoleWithSelectionAction"
58-
class="nl.deschepers.laraveltinker.action.OpenNewConsoleWithSelectionAction"
59-
text="Open Tinker Console With Selection"
60-
description="Opens a new tinker console with the code you have currently selected."
61-
icon="/icons/icon.svg">
58+
class="nl.deschepers.laraveltinker.action.OpenNewConsoleWithSelectionAction"
59+
text="Open Tinker Console With Selection"
60+
description="Opens a new tinker console with the code you have currently selected."
61+
icon="/icons/icon.svg">
6262
<add-to-group group-id="EditorPopupMenu" anchor="last"/>
6363
</action>
6464
<action
65-
id="nl.deschepers.laraveltinker.action.RunConsoleEditorContextAction"
66-
class="nl.deschepers.laraveltinker.action.RunConsoleEditorContextAction"
67-
text="Run Tinker Console"
68-
icon="/icons/tinker-run.svg"
65+
id="nl.deschepers.laraveltinker.action.RunConsoleEditorContextAction"
66+
class="nl.deschepers.laraveltinker.action.RunConsoleEditorContextAction"
67+
text="Run Tinker Console"
68+
icon="/icons/tinker-run.svg"
6969
>
7070
<add-to-group group-id="EditorPopupMenu.Run" anchor="before" relative-to-action="RunContextPopupGroup"/>
7171
</action>
@@ -80,36 +80,34 @@
8080
<postStartupActivity implementation="nl.deschepers.laraveltinker.startup.Migrations"/>
8181

8282
<applicationService
83-
serviceImplementation="nl.deschepers.laraveltinker.settings.PersistentApplicationCache"
83+
serviceImplementation="nl.deschepers.laraveltinker.settings.PersistentApplicationCache"
8484
/>
8585
<applicationService
86-
serviceImplementation="nl.deschepers.laraveltinker.settings.GlobalSettingsState"/>
87-
<projectService
88-
serviceImplementation="nl.deschepers.laraveltinker.settings.ProjectSettingsState"/>
86+
serviceImplementation="nl.deschepers.laraveltinker.settings.GlobalSettingsState"/>
8987

9088
<applicationConfigurable
91-
parentId="tools"
92-
instance="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
93-
id="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
94-
displayName="Laravel Tinker"/>
89+
parentId="tools"
90+
instance="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
91+
id="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
92+
displayName="Laravel Tinker"/>
9593
<projectConfigurable
96-
parentId="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
97-
instance="nl.deschepers.laraveltinker.settings.ProjectSettingsConfigurable"
98-
id="nl.deschepers.laraveltinker.settings.ProjectSettingsConfigurable"
99-
displayName="Project Settings"
100-
nonDefaultProject="true"
94+
parentId="nl.deschepers.laraveltinker.settings.GlobalSettingsConfigurable"
95+
instance="nl.deschepers.laraveltinker.settings.ProjectSettingsConfigurable"
96+
id="nl.deschepers.laraveltinker.settings.ProjectSettingsConfigurable"
97+
displayName="Project Settings"
98+
nonDefaultProject="true"
10199
/>
102100

103101
<codeInsight.lineMarkerProvider
104-
implementationClass="nl.deschepers.laraveltinker.linemarkerprovider.TinkerRunLineMarkerProvider"
105-
language="PHP"
102+
implementationClass="nl.deschepers.laraveltinker.linemarkerprovider.TinkerRunLineMarkerProvider"
103+
language="PHP"
106104
/>
107105
<scratch.rootType implementation="nl.deschepers.laraveltinker.util.LaravelTinkerConsolesRootType"/>
108106

109107
<toolWindow anchor="right"
110-
factoryClass="nl.deschepers.laraveltinker.toolwindow.TinkerOutputToolWindowFactory"
111-
icon="/icons/icon@13.svg"
112-
id="Laravel Tinker"
108+
factoryClass="nl.deschepers.laraveltinker.toolwindow.TinkerOutputToolWindowFactory"
109+
icon="/icons/icon@13.svg"
110+
id="Laravel Tinker"
113111
/>
114112

115113
<notificationGroup id="Laravel Tinker" displayType="BALLOON" key="lt.notification.group.name"/>

0 commit comments

Comments
 (0)