Skip to content

Commit 823ee64

Browse files
N1k145N1k145
authored
Merge branch 'master' into issue3739
2 parents 9c6396c + e6d3cbf commit 823ee64

File tree

11 files changed

+20
-267
lines changed

11 files changed

+20
-267
lines changed

‎bundles/org.eclipse.search/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.search; singleton:=true
5-
Bundle-Version: 3.18.0.qualifier
5+
Bundle-Version: 3.18.100.qualifier
66
Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %providerName

‎bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ SearchPage_wholeWord= Who&le word
9797

9898
TextSearchEngine_statusMessage= Problems encountered during text search.
9999

100-
TextSearchInnermostProjectFilter_action_label=Show only most &nested match
100+
TextSearchInnermostProjectFilter_action_label=Show Only Most &Nested Match
101101
TextSearchInnermostProjectFilter_name=Duplicate match from outer project
102102
TextSearchInnermostProjectFilter_description= For files in nested projects, don't show matches for duplicate file references that are owned by projects that aren't the innermost project.
103103
TextSearchPage_searchIn_label=Search In

‎bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/OuterProjectFileFilter.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,15 @@ public class OuterProjectFileFilter extends MatchFilter {
2828
@Override
2929
public boolean filters(Match match) {
3030
if (match instanceof FileMatch) {
31-
IFile file= ((FileMatch)match).getFile();
31+
IFile file = ((FileMatch) match).getFile();
3232
URI locationUri = file.getLocationURI();
33+
3334
IFile innermostFile = locationUri == null ? file : //
3435
Arrays.stream(file.getWorkspace().getRoot().findFilesForLocationURI(locationUri)) //
36+
// Don't consider the content of a closed project
37+
// for filtering because the matches there cannot be
38+
// shown
39+
.filter(aFile -> aFile.getProject().isAccessible())
3540
.min(Comparator.comparingInt(aFile -> aFile.getFullPath().segments().length))
3641
// shortest workspace (project relative) full path
3742
// means most nested project

‎bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControl.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ private void addSourceViewerListeners() {
396396

397397
if (sourceViewer instanceof ITextViewerExtension4 extension) {
398398
textPresentationListener = e -> {
399-
Display.getDefault().asyncExec(() -> {
399+
textWidget.getDisplay().asyncExec(() -> {
400400
if (textWidget.isDisposed() || areStickyLinesOutDated(textWidget)) {
401401
return;
402402
}
@@ -516,12 +516,15 @@ public void keyReleased(KeyEvent e) {
516516

517517
@Override
518518
public void caretMoved(CaretEvent event) {
519-
int offsetEndPosition= sourceViewer.getTextWidget().getCharCount();
519+
StyledText textWidget = sourceViewer.getTextWidget();
520+
int offsetEndPosition= textWidget.getCharCount();
520521
if (event.caretOffset == 0 || event.caretOffset == offsetEndPosition) {
521522
return;
522523
}
523-
Display.getDefault().asyncExec(() -> {
524-
StyledText textWidget= sourceViewer.getTextWidget();
524+
textWidget.getDisplay().asyncExec(() -> {
525+
if (textWidget.isDisposed()) {
526+
return;
527+
}
525528
if (!enableCaretListener || event.caretOffset > textWidget.getCharCount()) {
526529
return;
527530
}

‎bundles/org.eclipse.ui.workbench/.settings/.api_filters‎

Lines changed: 0 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<component id="org.eclipse.ui.workbench" version="2">
3-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.CharacterKey">
4-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
5-
<message_arguments>
6-
<message_argument value="org.eclipse.ui.keys.CharacterKey"/>
7-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
8-
</message_arguments>
9-
</filter>
10-
</resource>
11-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.IKeyFormatter">
12-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
13-
<message_arguments>
14-
<message_argument value="org.eclipse.ui.keys.IKeyFormatter"/>
15-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
16-
</message_arguments>
17-
</filter>
18-
</resource>
19-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.Key">
20-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
21-
<message_arguments>
22-
<message_argument value="org.eclipse.ui.keys.Key"/>
23-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
24-
</message_arguments>
25-
</filter>
26-
</resource>
27-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.KeyFormatterFactory">
28-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
29-
<message_arguments>
30-
<message_argument value="org.eclipse.ui.keys.KeyFormatterFactory"/>
31-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
32-
</message_arguments>
33-
</filter>
34-
</resource>
35-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.KeySequence">
36-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
37-
<message_arguments>
38-
<message_argument value="org.eclipse.ui.keys.KeySequence"/>
39-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
40-
</message_arguments>
41-
</filter>
42-
</resource>
43-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.KeyStroke">
44-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
45-
<message_arguments>
46-
<message_argument value="org.eclipse.ui.keys.KeyStroke"/>
47-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
48-
</message_arguments>
49-
</filter>
50-
</resource>
51-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.ModifierKey">
52-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
53-
<message_arguments>
54-
<message_argument value="org.eclipse.ui.keys.ModifierKey"/>
55-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
56-
</message_arguments>
57-
</filter>
58-
</resource>
59-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.NaturalKey">
60-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
61-
<message_arguments>
62-
<message_argument value="org.eclipse.ui.keys.NaturalKey"/>
63-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
64-
</message_arguments>
65-
</filter>
66-
</resource>
67-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.ParseException">
68-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
69-
<message_arguments>
70-
<message_argument value="org.eclipse.ui.keys.ParseException"/>
71-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
72-
</message_arguments>
73-
</filter>
74-
</resource>
75-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.SWTKeySupport">
76-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
77-
<message_arguments>
78-
<message_argument value="org.eclipse.ui.keys.SWTKeySupport"/>
79-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
80-
</message_arguments>
81-
</filter>
82-
</resource>
83-
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.keys.SpecialKey">
84-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3601" id="305324134">
85-
<message_arguments>
86-
<message_argument value="org.eclipse.ui.keys.SpecialKey"/>
87-
<message_argument value="org.eclipse.ui.workbench_3.138.0"/>
88-
</message_arguments>
89-
</filter>
90-
</resource>
91-
<resource path="eclipseui/org/eclipse/ui/IPageLayout.java" type="org.eclipse.ui.IPageLayout">
92-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3606" id="405901410">
93-
<message_arguments>
94-
<message_argument value="org.eclipse.ui.IPageLayout"/>
95-
<message_argument value="addFastView(String)"/>
96-
</message_arguments>
97-
</filter>
98-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3606" id="405901410">
99-
<message_arguments>
100-
<message_argument value="org.eclipse.ui.IPageLayout"/>
101-
<message_argument value="addFastView(String, float)"/>
102-
</message_arguments>
103-
</filter>
104-
</resource>
105-
<resource path="eclipseui/org/eclipse/ui/ISharedImages.java" type="org.eclipse.ui.ISharedImages">
106-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
107-
<message_arguments>
108-
<message_argument value="org.eclipse.ui.ISharedImages"/>
109-
<message_argument value="IMG_TOOL_BACK_HOVER"/>
110-
</message_arguments>
111-
</filter>
112-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
113-
<message_arguments>
114-
<message_argument value="org.eclipse.ui.ISharedImages"/>
115-
<message_argument value="IMG_TOOL_COPY_HOVER"/>
116-
</message_arguments>
117-
</filter>
118-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
119-
<message_arguments>
120-
<message_argument value="org.eclipse.ui.ISharedImages"/>
121-
<message_argument value="IMG_TOOL_CUT_HOVER"/>
122-
</message_arguments>
123-
</filter>
124-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
125-
<message_arguments>
126-
<message_argument value="org.eclipse.ui.ISharedImages"/>
127-
<message_argument value="IMG_TOOL_DELETE_HOVER"/>
128-
</message_arguments>
129-
</filter>
130-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
131-
<message_arguments>
132-
<message_argument value="org.eclipse.ui.ISharedImages"/>
133-
<message_argument value="IMG_TOOL_FORWARD_HOVER"/>
134-
</message_arguments>
135-
</filter>
136-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
137-
<message_arguments>
138-
<message_argument value="org.eclipse.ui.ISharedImages"/>
139-
<message_argument value="IMG_TOOL_NEW_WIZARD_HOVER"/>
140-
</message_arguments>
141-
</filter>
142-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
143-
<message_arguments>
144-
<message_argument value="org.eclipse.ui.ISharedImages"/>
145-
<message_argument value="IMG_TOOL_PASTE_HOVER"/>
146-
</message_arguments>
147-
</filter>
148-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
149-
<message_arguments>
150-
<message_argument value="org.eclipse.ui.ISharedImages"/>
151-
<message_argument value="IMG_TOOL_REDO_HOVER"/>
152-
</message_arguments>
153-
</filter>
154-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
155-
<message_arguments>
156-
<message_argument value="org.eclipse.ui.ISharedImages"/>
157-
<message_argument value="IMG_TOOL_UNDO_HOVER"/>
158-
</message_arguments>
159-
</filter>
160-
<filter comment="https://github.com/eclipse-platform/eclipse.platform.ui/pull/3672" id="405864542">
161-
<message_arguments>
162-
<message_argument value="org.eclipse.ui.ISharedImages"/>
163-
<message_argument value="IMG_TOOL_UP_HOVER"/>
164-
</message_arguments>
165-
</filter>
166-
</resource>
1673
<resource path="eclipseui/org/eclipse/ui/dialogs/YesNoCancelListSelectionDialog.java" type="org.eclipse.ui.dialogs.YesNoCancelListSelectionDialog">
1684
<filter id="576778288">
1695
<message_arguments>

‎bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
5-
Bundle-Version: 3.138.0.qualifier
5+
Bundle-Version: 3.138.100.qualifier
66
Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %providerName

‎bundles/org.eclipse.ui/.settings/.api_filters‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎bundles/org.eclipse.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.ui; singleton:=true
5-
Bundle-Version: 3.208.0.qualifier
5+
Bundle-Version: 3.208.100.qualifier
66
Bundle-Activator: org.eclipse.ui.internal.UIPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %Plugin.providerName

‎examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.eclipse.platform</groupId>
1616
<artifactId>eclipse.platform.ui</artifactId>
17-
<version>4.39.0-SNAPSHOT</version>
17+
<version>4.40.0-SNAPSHOT</version>
1818
</parent>
1919
<artifactId>eclipse.platform.ui.examples</artifactId>
2020
<packaging>pom</packaging>

‎features/org.eclipse.e4.rcp/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.e4.rcp"
44
label="%featureName"
5-
version="4.39.0.qualifier"
5+
version="4.40.0.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

0 commit comments

Comments
 (0)