Skip to content

Commit cfbecaa

Browse files
tortmayrtortmayr
authored
Bugfixes for 2.0. (#92)
- Ensure that export command is working by adding the standaloneExportModule to the set of default modules. Potentially should be replaced with a IDE native approach in the future - Ensure that the `Open in Workflow Viewer` context menu entry is not visible inside of the diagram editor. - Remove breaking "pretter.prettierPath" vscode setting - Align Java compliance level of projects to 17
1 parent 37b003c commit cfbecaa

File tree

7 files changed

+55
-46
lines changed

7 files changed

+55
-46
lines changed

‎client/.vscode/settings.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"source.fixAll.eslint": true
1111
},
1212
"eslint.validate": ["javascript", "typescript"],
13-
"prettier.prettierPath": "node_modules/prettier",
1413
"search.exclude": {
1514
"**/node_modules": true,
1615
"**/lib": true

‎client/packages/ide/src/default-modules.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
********************************************************************************/
1616

17-
import { ModuleConfiguration, statusModule } from '@eclipse-glsp/client';
17+
import { ModuleConfiguration, standaloneExportModule, statusModule } from '@eclipse-glsp/client';
1818
import { eclipseCopyPasteModule } from './features/copy-paste/copy-paste-module';
1919
import { eclipseDeleteModule } from './features/delete/delete-module';
2020
import { eclipseFallbackModule } from './features/fallback/fallback-module';
2121

22-
export const ECLIPSE_DEFAULT_MODULES = [eclipseCopyPasteModule, eclipseDeleteModule, eclipseFallbackModule] as const;
22+
export const ECLIPSE_DEFAULT_MODULES = [
23+
eclipseCopyPasteModule,
24+
eclipseDeleteModule,
25+
eclipseFallbackModule,
26+
standaloneExportModule
27+
] as const;
2328

2429
export const ECLIPSE_DEFAULT_MODULE_CONFIG: ModuleConfiguration = { add: [...ECLIPSE_DEFAULT_MODULES], remove: statusModule };

‎server/example/org.eclipse.glsp.ide.workflow.editor/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3232
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
3333
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3434
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
35-
org.eclipse.jdt.core.compiler.compliance=11
35+
org.eclipse.jdt.core.compiler.compliance=17
3636
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3737
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3838
org.eclipse.jdt.core.compiler.debug.sourceFile=generate

‎server/example/org.eclipse.glsp.ide.workflow.editor/fragment.e4xmi‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<?xml version="1.0" encoding="ASCII"?>
2-
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_Lo1j0CVVEe6BWNnGTQlFsQ">
3-
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_tlU_oCx1Ee6j-oaIUDoEgw" featurename="snippets" parentElementId="org.eclipse.e4.legacy.ide.application">
4-
<elements xsi:type="basic:Part" xmi:id="_vceugCx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.part.workflowViewer" contributionURI="bundleclass://org.eclipse.glsp.ide.workflow.editor/org.eclipse.glsp.ide.workflow.editor.WorkflowPart" label="Workflow Viewer" closeable="true">
5-
<menus xsi:type="menu:PopupMenu" xmi:id="_cV-L4C0eEe6x6_YHT7ghoA" elementId="org.eclipse.glsp.workflow.editor"/>
6-
</elements>
7-
</fragments>
8-
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_3bM4kCx1Ee6j-oaIUDoEgw" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
9-
<elements xsi:type="commands:Command" xmi:id="_4utu4Cx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.command.openViewer" commandName="Open Workflow Viewer"/>
10-
</fragments>
11-
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_9RCDgCx1Ee6j-oaIUDoEgw" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
12-
<elements xsi:type="commands:Handler" xmi:id="__e5CMCx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.handler.openViewer" contributionURI="bundleclass://org.eclipse.glsp.ide.workflow.editor/org.eclipse.glsp.ide.workflow.editor.OpenWorkflowViewerHandler" command="_4utu4Cx1Ee6j-oaIUDoEgw"/>
13-
</fragments>
14-
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_A-w5gCx2Ee6j-oaIUDoEgw" featurename="menuContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
15-
<elements xsi:type="menu:MenuContribution" xmi:id="_B4ZQMCx2Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.menucontribution.openViewer" positionInParent="after=additions" parentId="popup">
16-
<children xsi:type="menu:HandledMenuItem" xmi:id="_DRz6MCx2Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.menu.openViewer" label="Open In Workflow Viewer" command="_4utu4Cx1Ee6j-oaIUDoEgw">
17-
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_FLABsCx8Ee6j-oaIUDoEgw" coreExpressionId="org.eclipse.glsp.ide.workflow.editor.workflowFile"/>
18-
</children>
19-
</elements>
20-
</fragments>
21-
</fragment:ModelFragments>
1+
<?xml version="1.0" encoding="ASCII"?>
2+
<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_Lo1j0CVVEe6BWNnGTQlFsQ">
3+
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_tlU_oCx1Ee6j-oaIUDoEgw" featurename="snippets" parentElementId="org.eclipse.e4.legacy.ide.application">
4+
<elements xsi:type="basic:Part" xmi:id="_vceugCx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.part.workflowViewer" contributionURI="bundleclass://org.eclipse.glsp.ide.workflow.editor/org.eclipse.glsp.ide.workflow.editor.WorkflowPart" label="Workflow Viewer" closeable="true">
5+
<menus xsi:type="menu:PopupMenu" xmi:id="_cV-L4C0eEe6x6_YHT7ghoA" elementId="org.eclipse.glsp.workflow.editor"/>
6+
</elements>
7+
</fragments>
8+
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_3bM4kCx1Ee6j-oaIUDoEgw" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
9+
<elements xsi:type="commands:Command" xmi:id="_4utu4Cx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.command.openViewer" commandName="Open Workflow Viewer"/>
10+
</fragments>
11+
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_9RCDgCx1Ee6j-oaIUDoEgw" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
12+
<elements xsi:type="commands:Handler" xmi:id="__e5CMCx1Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.handler.openViewer" contributionURI="bundleclass://org.eclipse.glsp.ide.workflow.editor/org.eclipse.glsp.ide.workflow.editor.OpenWorkflowViewerHandler" command="_4utu4Cx1Ee6j-oaIUDoEgw"/>
13+
</fragments>
14+
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_A-w5gCx2Ee6j-oaIUDoEgw" featurename="menuContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
15+
<elements xsi:type="menu:MenuContribution" xmi:id="_B4ZQMCx2Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.menucontribution.openViewer" positionInParent="after=additions" parentId="popup">
16+
<children xsi:type="menu:HandledMenuItem" xmi:id="_DRz6MCx2Ee6j-oaIUDoEgw" elementId="org.eclipse.glsp.ide.workflow.editor.menu.openViewer" label="Open In Workflow Viewer" command="_4utu4Cx1Ee6j-oaIUDoEgw">
17+
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_FLABsCx8Ee6j-oaIUDoEgw" coreExpressionId="org.eclipse.glsp.ide.workflow.editor.workflowFile"/>
18+
</children>
19+
</elements>
20+
</fragments>
21+
</fragment:ModelFragments>

‎server/example/org.eclipse.glsp.ide.workflow.editor/plugin.xml‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,22 +209,28 @@
209209
</extension>
210210
<extension
211211
point="org.eclipse.core.expressions.definitions">
212-
<definition
213-
id="org.eclipse.glsp.ide.workflow.editor.workflowFile">
214-
<with
215-
variable="selection">
216-
<iterate
217-
operator="and">
218-
<adapt
219-
type="org.eclipse.core.resources.IResource">
220-
<test
221-
forcePluginActivation="true"
222-
property="org.eclipse.core.resources.name"
223-
value="*.wf">
224-
</test>
225-
</adapt></iterate>
226-
</with>
227-
</definition>
212+
<definition id="org.eclipse.glsp.ide.workflow.editor.workflowFile">
213+
<iterate
214+
ifEmpty="false"
215+
operator="and">
216+
<adapt type="org.eclipse.core.resources.IResource">
217+
<test forcePluginActivation="true" property="org.eclipse.core.resources.name" value="*.wf">
218+
</test>
219+
</adapt>
220+
<not>
221+
<or>
222+
<with variable="activePartId">
223+
<equals value="org.eclipse.glsp.workflow.editor">
224+
</equals>
225+
</with>
226+
<with variable="activePartId">
227+
<equals value="org.eclipse.glsp.ide.workflow.editor.part.workflowViewer">
228+
</equals>
229+
</with>
230+
</or>
231+
</not>
232+
</iterate>
233+
</definition>
228234
</extension>
229235

230236
</plugin>

‎server/plugins/org.eclipse.glsp.ide.editor/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
3030
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
3131
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3232
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
33-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
33+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
3434
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
35-
org.eclipse.jdt.core.compiler.compliance=11
35+
org.eclipse.jdt.core.compiler.compliance=17
3636
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3737
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3838
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -147,7 +147,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
147147
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
148148
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
149149
org.eclipse.jdt.core.compiler.release=enabled
150-
org.eclipse.jdt.core.compiler.source=11
150+
org.eclipse.jdt.core.compiler.source=15
151151
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
152152
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
153153
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

‎server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/ui/BrowserKeyBindingForwarderInstaller.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.eclipse.core.commands.NotEnabledException;
2525
import org.eclipse.core.commands.NotHandledException;
2626
import org.eclipse.core.commands.common.NotDefinedException;
27-
import org.eclipse.glsp.ide.editor.utils.SWTUtil;
2827
import org.eclipse.glsp.ide.editor.utils.UIUtil;
2928
import org.eclipse.jface.bindings.Binding;
3029
import org.eclipse.jface.bindings.keys.IKeyLookup;
@@ -68,7 +67,7 @@ public BrowserKeyBindingForwarderInstaller(final IServiceLocator serviceLocator)
6867

6968
@Override
7069
public Optional<BrowserFunction> install(final Browser browser) {
71-
return SWTUtil.isChromiumOrEdge(browser) ? doInstall(browser) : Optional.empty();
70+
return doInstall(browser);
7271
}
7372

7473
protected Optional<BrowserFunction> doInstall(final Browser browser) {

0 commit comments

Comments
 (0)