diff --git a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLangLSPExtension.java b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLangLSPExtension.java
index 30fad39ae..a1df4a0c5 100644
--- a/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLangLSPExtension.java
+++ b/org.eclipse.xtext.ide.tests/xtend-gen/org/eclipse/xtext/ide/tests/testlanguage/ide/TestLangLSPExtension.java
@@ -45,18 +45,18 @@ import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 @ImplementedBy(TestLangLSPExtension.Impl.class)
 @SuppressWarnings("all")
 public interface TestLangLSPExtension extends ILanguageServerExtension {
-  public static class TextOfLineResult {
+  class TextOfLineResult {
     public String text;
   }
   
-  public static class TextOfLineParam {
+  class TextOfLineParam {
     public String uri;
     
     public int line;
   }
   
   @ToString
-  public static class BuildNotification {
+  class BuildNotification {
     public String message;
     
     @Override
@@ -68,12 +68,12 @@ public interface TestLangLSPExtension extends ILanguageServerExtension {
     }
   }
   
-  public interface CustomClient {
+  interface CustomClient {
     @JsonNotification
-    public abstract void buildHappened(final TestLangLSPExtension.BuildNotification notification);
+    void buildHappened(final TestLangLSPExtension.BuildNotification notification);
   }
   
-  public static class Impl implements ILanguageServerExtension, TestLangLSPExtension, ILanguageServerAccess.IBuildListener, JsonRpcMethodProvider {
+  class Impl implements ILanguageServerExtension, TestLangLSPExtension, ILanguageServerAccess.IBuildListener, JsonRpcMethodProvider {
     private ILanguageServerAccess access;
     
     private TestLangLSPExtension.CustomClient client;
@@ -147,8 +147,8 @@ public interface TestLangLSPExtension extends ILanguageServerExtension {
   }
   
   @JsonRequest
-  public abstract CompletableFuture<TestLangLSPExtension.TextOfLineResult> getTextOfLine(final TestLangLSPExtension.TextOfLineParam param);
+  CompletableFuture<TestLangLSPExtension.TextOfLineResult> getTextOfLine(final TestLangLSPExtension.TextOfLineParam param);
   
   @JsonRequest
-  public abstract CompletableFuture<Set<String>> getAllOpNames();
+  CompletableFuture<Set<String>> getAllOpNames();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.java
index 379d6f06b..0575dc0a1 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/bracketmatching/IBracePairProvider.java
@@ -24,5 +24,5 @@ public interface IBracePairProvider {
    * Returns a set of definitions for brace pairs that need to be matched when
    * editing code.
    */
-  public abstract Set<BracePair> getPairs();
+  Set<BracePair> getPairs();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.java
index 2724ade9d..c6f86abbd 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IIdeContentProposalAcceptor.java
@@ -17,7 +17,7 @@ public interface IIdeContentProposalAcceptor {
   /**
    * Handle the given content assist entry. The entry may be {@code null}.
    */
-  public abstract void accept(final ContentAssistEntry entry, final int priority);
+  void accept(final ContentAssistEntry entry, final int priority);
   
-  public abstract boolean canAcceptMoreProposals();
+  boolean canAcceptMoreProposals();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.java
index 7fde23e34..b11c23e06 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/contentassist/IPrefixMatcher.java
@@ -22,12 +22,12 @@ public interface IPrefixMatcher {
   /**
    * Default prefix matcher that compares the prefix of the candidate ignoring case.
    */
-  public static class IgnoreCase implements IPrefixMatcher {
+  class IgnoreCase implements IPrefixMatcher {
     @Override
     public boolean isCandidateMatchingPrefix(final String name, final String prefix) {
       return name.regionMatches(true, 0, prefix, 0, prefix.length());
     }
   }
   
-  public abstract boolean isCandidateMatchingPrefix(final String name, final String prefix);
+  boolean isCandidateMatchingPrefix(final String name, final String prefix);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.java
index a57825156..134f1ce1d 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/ICallHierarchyBuilder.java
@@ -17,13 +17,13 @@ import org.eclipse.xtext.ide.editor.hierarchy.IHierarchyBuilder;
  */
 @SuppressWarnings("all")
 public interface ICallHierarchyBuilder extends IHierarchyBuilder {
-  public enum CallHierarchyType {
+  enum CallHierarchyType {
     CALLER,
     
     CALLEE;
   }
   
-  public abstract ICallHierarchyBuilder.CallHierarchyType getHierarchyType();
+  ICallHierarchyBuilder.CallHierarchyType getHierarchyType();
   
-  public abstract void setHierarchyType(final ICallHierarchyBuilder.CallHierarchyType hierarchyType);
+  void setHierarchyType(final ICallHierarchyBuilder.CallHierarchyType hierarchyType);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.java
index e7d8cd6e2..4b8ac24bc 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyBuilder.java
@@ -23,10 +23,10 @@ public interface IHierarchyBuilder {
   /**
    * @return root hierarchy nodes for the given URI; empty if the hierarchy cannot be built for the given URI
    */
-  public abstract Collection<IHierarchyNode> buildRoots(final URI rootURI, final IProgressMonitor monitor);
+  Collection<IHierarchyNode> buildRoots(final URI rootURI, final IProgressMonitor monitor);
   
   /**
    * @return child nodes for the given parent node; empty if {@link IHierarchyNode#mayHaveChildren} returns <code>false</code> for the parent
    */
-  public abstract Collection<IHierarchyNode> buildChildren(final IHierarchyNode parent, final IProgressMonitor monitor);
+  Collection<IHierarchyNode> buildChildren(final IHierarchyNode parent, final IProgressMonitor monitor);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.java
index 69024d6c7..5cee957c7 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNode.java
@@ -23,25 +23,25 @@ public interface IHierarchyNode extends INavigatable {
   /**
    * @return an associated element that is used to build child nodes
    */
-  public abstract IEObjectDescription getElement();
+  IEObjectDescription getElement();
   
   /**
    * @return a parent; <code>null</code> if the node is a root
    */
-  public abstract IHierarchyNode getParent();
+  IHierarchyNode getParent();
   
   /**
    * @return references used to reach the node from a parent; empty if the node is a root
    */
-  public abstract Collection<IHierarchyNodeReference> getReferences();
+  Collection<IHierarchyNodeReference> getReferences();
   
   /**
    * @return whether there is a parent (can be transitive) containing the same element as the node
    */
-  public abstract boolean isRecursive();
+  boolean isRecursive();
   
   /**
    * @return whether the node may have children; e.g. a recursive node cannot have children
    */
-  public abstract boolean mayHaveChildren();
+  boolean mayHaveChildren();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.java
index 3b40971e0..f3d3cbae2 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeLocationProvider.java
@@ -22,7 +22,7 @@ import org.eclipse.xtext.util.ITextRegionWithLineInformation;
 @ImplementedBy(DefaultHierarchyNodeLocationProvider.class)
 @SuppressWarnings("all")
 public interface IHierarchyNodeLocationProvider {
-  public abstract ITextRegionWithLineInformation getTextRegion(final EObject obj);
+  ITextRegionWithLineInformation getTextRegion(final EObject obj);
   
-  public abstract ITextRegionWithLineInformation getTextRegion(final EObject owner, final EStructuralFeature feature, final int indexInList);
+  ITextRegionWithLineInformation getTextRegion(final EObject owner, final EStructuralFeature feature, final int indexInList);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.java
index 0aebe7f9b..225866e26 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyNodeReference.java
@@ -18,5 +18,5 @@ import org.eclipse.xtext.util.ITextRegionWithLineInformation;
  */
 @SuppressWarnings("all")
 public interface IHierarchyNodeReference extends INavigatable, ITextRegionWithLineInformation {
-  public abstract String getText();
+  String getText();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.java
index 6fc5d9228..e604fe95a 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/hierarchy/IHierarchyRoot.java
@@ -19,9 +19,9 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
  */
 @SuppressWarnings("all")
 public interface IHierarchyRoot {
-  public abstract Collection<IHierarchyNode> getRoots();
+  Collection<IHierarchyNode> getRoots();
   
-  public static final IHierarchyRoot EMPTY = new IHierarchyRoot() {
+  static final IHierarchyRoot EMPTY = new IHierarchyRoot() {
     @Override
     public Collection<IHierarchyNode> getRoots() {
       return CollectionLiterals.<IHierarchyNode>emptyList();
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/navigation/INavigatable.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/navigation/INavigatable.java
index 97f008fb3..bf2807388 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/navigation/INavigatable.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/navigation/INavigatable.java
@@ -26,5 +26,5 @@ public interface INavigatable {
    * Avoid usage of resource sets, resources and eobjects as navigation elements, since it can lead to memory leaks.
    * </p>
    */
-  public abstract Object getNavigationElement();
+  Object getNavigationElement();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.java
index 27f9f086c..afbf6f831 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/HighlightingStyles.java
@@ -13,19 +13,19 @@ package org.eclipse.xtext.ide.editor.syntaxcoloring;
  */
 @SuppressWarnings("all")
 public interface HighlightingStyles {
-  public static final String KEYWORD_ID = "keyword";
+  static final String KEYWORD_ID = "keyword";
   
-  public static final String PUNCTUATION_ID = "punctuation";
+  static final String PUNCTUATION_ID = "punctuation";
   
-  public static final String COMMENT_ID = "comment";
+  static final String COMMENT_ID = "comment";
   
-  public static final String STRING_ID = "string";
+  static final String STRING_ID = "string";
   
-  public static final String NUMBER_ID = "number";
+  static final String NUMBER_ID = "number";
   
-  public static final String DEFAULT_ID = "default";
+  static final String DEFAULT_ID = "default";
   
-  public static final String INVALID_TOKEN_ID = "error";
+  static final String INVALID_TOKEN_ID = "error";
   
-  public static final String TASK_ID = "task";
+  static final String TASK_ID = "task";
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.java
index 2a3f11aa3..444de2516 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.java
@@ -25,7 +25,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
 @ImplementedBy(IEditorHighlightingConfigurationProvider.DefaultImpl.class)
 @SuppressWarnings("all")
 public interface IEditorHighlightingConfigurationProvider {
-  public static class DefaultImpl implements IEditorHighlightingConfigurationProvider {
+  class DefaultImpl implements IEditorHighlightingConfigurationProvider {
     @Inject
     private IGrammarAccess grammarAccess;
     
@@ -116,5 +116,5 @@ public interface IEditorHighlightingConfigurationProvider {
   /**
    * provides an editor specific highlighting configuration or null.
    */
-  public abstract String getConfiguration(final String editorName);
+  String getConfiguration(final String editorName);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescription.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescription.java
index 2f0b39c78..2b3a6f795 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescription.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescription.java
@@ -19,5 +19,5 @@ import org.eclipse.xtext.ide.labels.SimpleImageDescription;
  */
 @SuppressWarnings("all")
 public interface IImageDescription {
-  public static final SimpleImageDescription DEFAULT = new SimpleImageDescription("default");
+  static final SimpleImageDescription DEFAULT = new SimpleImageDescription("default");
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.java
index 6762f7116..83d3b34fe 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/IImageDescriptionProvider.java
@@ -17,5 +17,5 @@ import org.eclipse.xtext.ide.labels.IImageDescription;
 @ImplementedBy(EClassImageDescriptionProvider.class)
 @SuppressWarnings("all")
 public interface IImageDescriptionProvider {
-  public abstract IImageDescription getImageDescription(final Object element);
+  IImageDescription getImageDescription(final Object element);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/INameLabelProvider.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/INameLabelProvider.java
index c2ee8b05e..ee4068f7c 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/INameLabelProvider.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/labels/INameLabelProvider.java
@@ -16,5 +16,5 @@ import org.eclipse.xtext.ide.labels.SimpleNameLabelProvider;
 @ImplementedBy(SimpleNameLabelProvider.class)
 @SuppressWarnings("all")
 public interface INameLabelProvider {
-  public abstract String getNameLabel(final Object element);
+  String getNameLabel(final Object element);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameNameValidator.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameNameValidator.java
index d5fa8444d..12f367525 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameNameValidator.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameNameValidator.java
@@ -23,7 +23,7 @@ import org.eclipse.xtext.xbase.lib.Exceptions;
 @ImplementedBy(IRenameNameValidator.RuleBasedNameValidator.class)
 @SuppressWarnings("all")
 public interface IRenameNameValidator {
-  public static class RuleBasedNameValidator implements IRenameNameValidator {
+  class RuleBasedNameValidator implements IRenameNameValidator {
     @Inject
     private IValueConverterService valueConverterService;
     
@@ -58,5 +58,5 @@ public interface IRenameNameValidator {
     }
   }
   
-  public abstract void validate(final EObject target, final String newName, final RefactoringIssueAcceptor issues);
+  void validate(final EObject target, final String newName, final RefactoringIssueAcceptor issues);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameStrategy2.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameStrategy2.java
index eccdf2db2..d21ba0d73 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameStrategy2.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IRenameStrategy2.java
@@ -34,7 +34,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
  */
 @SuppressWarnings("all")
 public interface IRenameStrategy2 {
-  public static class DefaultImpl implements IRenameStrategy2 {
+  class DefaultImpl implements IRenameStrategy2 {
     @Inject
     private IResourceServiceProvider resourceServiceProvider;
     
@@ -76,5 +76,5 @@ public interface IRenameStrategy2 {
     }
   }
   
-  public abstract void applyRename(final RenameContext context);
+  void applyRename(final RenameContext context);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IResourceRelocationStrategy.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IResourceRelocationStrategy.java
index a78768b3d..d4c0d54b3 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IResourceRelocationStrategy.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/IResourceRelocationStrategy.java
@@ -29,7 +29,7 @@ import org.eclipse.xtext.ide.refactoring.ResourceRelocationContext;
  */
 @SuppressWarnings("all")
 public interface IResourceRelocationStrategy {
-  public abstract void applyChange(final ResourceRelocationContext context);
+  void applyChange(final ResourceRelocationContext context);
   
   /**
    * By overriding this method client implementations may explicitly demand for relying
@@ -51,7 +51,7 @@ public interface IResourceRelocationStrategy {
    * 
    * @since 2.18
    */
-  public default boolean requiresUsageOfPersistedIndex(final ResourceRelocationContext context) {
+  default boolean requiresUsageOfPersistedIndex(final ResourceRelocationContext context) {
     return false;
   }
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/RefactoringIssueAcceptor.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/RefactoringIssueAcceptor.java
index d83195062..66e8aad2c 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/RefactoringIssueAcceptor.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/refactoring/RefactoringIssueAcceptor.java
@@ -19,7 +19,7 @@ import org.eclipse.xtext.util.ITextRegion;
  */
 @SuppressWarnings("all")
 public interface RefactoringIssueAcceptor {
-  public enum Severity {
+  enum Severity {
     FATAL,
     
     ERROR,
@@ -31,15 +31,15 @@ public interface RefactoringIssueAcceptor {
     OK;
   }
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final URI uri, final ResourceSet resourceSet);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final URI uri, final ResourceSet resourceSet);
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final URI resourceUri);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final URI resourceUri);
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final EObject element);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final EObject element);
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final EObject element, final ITextRegion region);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final EObject element, final ITextRegion region);
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final Exception exc, final Logger log);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final Exception exc, final Logger log);
   
-  public abstract void add(final RefactoringIssueAcceptor.Severity severity, final String message, final Object... params);
+  void add(final RefactoringIssueAcceptor.Severity severity, final String message, final Object... params);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/BuildListener.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/BuildListener.java
index 61f0fb88f..05797f7fa 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/BuildListener.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/BuildListener.java
@@ -15,5 +15,5 @@ import org.eclipse.xtext.resource.IResourceDescription;
  */
 @SuppressWarnings("all")
 public interface BuildListener {
-  public abstract void afterBuild(final List<IResourceDescription.Delta> deltas);
+  void afterBuild(final List<IResourceDescription.Delta> deltas);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ICapabilitiesContributor.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ICapabilitiesContributor.java
index 6529dad67..5d9e0d1f4 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ICapabilitiesContributor.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ICapabilitiesContributor.java
@@ -18,5 +18,5 @@ public interface ICapabilitiesContributor {
   /**
    * Allows an individual language to contribute to and overwrite properties in the server's capabilities.
    */
-  public abstract ServerCapabilities contribute(final ServerCapabilities capabilities, final InitializeParams params);
+  ServerCapabilities contribute(final ServerCapabilities capabilities, final InitializeParams params);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerAccess.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerAccess.java
index 94c4df333..d8a760f49 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerAccess.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerAccess.java
@@ -34,7 +34,7 @@ import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 @SuppressWarnings("all")
 public interface ILanguageServerAccess {
   @Data
-  public static class Context {
+  class Context {
     private final Resource resource;
     
     private final Document document;
@@ -125,7 +125,7 @@ public interface ILanguageServerAccess {
   }
   
   @Data
-  public static class IndexContext {
+  class IndexContext {
     private final IResourceDescriptions index;
     
     private final CancelIndicator cancelChecker;
@@ -188,32 +188,32 @@ public interface ILanguageServerAccess {
     }
   }
   
-  public interface IBuildListener {
-    public abstract void afterBuild(final List<IResourceDescription.Delta> deltas);
+  interface IBuildListener {
+    void afterBuild(final List<IResourceDescription.Delta> deltas);
   }
   
   /**
    * provides read access to a fully resolved resource and Document.
    */
-  public abstract <T extends Object> CompletableFuture<T> doRead(final String uri, final Function<ILanguageServerAccess.Context, T> function);
+  <T extends Object> CompletableFuture<T> doRead(final String uri, final Function<ILanguageServerAccess.Context, T> function);
   
   /**
    * Provides read access to the Xtext index.
    * 
    * @since 2.18
    */
-  public abstract <T extends Object> CompletableFuture<T> doReadIndex(final Function<? super ILanguageServerAccess.IndexContext, ? extends T> function);
+  <T extends Object> CompletableFuture<T> doReadIndex(final Function<? super ILanguageServerAccess.IndexContext, ? extends T> function);
   
   /**
    * registers a build listener on the this language server
    */
-  public abstract void addBuildListener(final ILanguageServerAccess.IBuildListener listener);
+  void addBuildListener(final ILanguageServerAccess.IBuildListener listener);
   
   /**
    * @return the language client facade. It usually also implements Endpoint, which can be used to
    * call non-standard extensions to the LSP.
    */
-  public abstract LanguageClient getLanguageClient();
+  LanguageClient getLanguageClient();
   
   /**
    * Creates a new {@link ResourceSet} to be used with the {@link IChangeSerializer} API.
@@ -228,18 +228,18 @@ public interface ILanguageServerAccess {
    *   reflect model changes immediately.
    * @since 2.18
    */
-  public abstract ResourceSet newLiveScopeResourceSet(final URI uri);
+  ResourceSet newLiveScopeResourceSet(final URI uri);
   
   /**
    * @return the parameters as negotiated during client and server on initialization.
    * @since 2.18
    */
-  public abstract InitializeParams getInitializeParams();
+  InitializeParams getInitializeParams();
   
   /**
    * Returns with the {@link InitializeResult} of the LS.
    * 
    * @since 2.18
    */
-  public abstract InitializeResult getInitializeResult();
+  InitializeResult getInitializeResult();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerExtension.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerExtension.java
index 477e3d7fa..97d6660e4 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerExtension.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/ILanguageServerExtension.java
@@ -23,10 +23,10 @@ public interface ILanguageServerExtension {
    * 
    * To indicate that a request is not handled, this exception should be thrown by the service.
    */
-  public static final RuntimeException NOT_HANDLED_EXCEPTION = new UnsupportedOperationException("not handled");
+  static final RuntimeException NOT_HANDLED_EXCEPTION = new UnsupportedOperationException("not handled");
   
   /**
    * the language server provides a access to language server documents, resources and build events.
    */
-  public abstract void initialize(final ILanguageServerAccess access);
+  void initialize(final ILanguageServerAccess access);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.java
index 2f212b0bf..2553fbb45 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.java
@@ -23,5 +23,5 @@ import org.eclipse.xtext.util.CancelIndicator;
 @Deprecated
 @SuppressWarnings("all")
 public interface ICodeActionService {
-  public abstract List<Either<Command, CodeAction>> getCodeActions(final Document document, final XtextResource resource, final CodeActionParams params, final CancelIndicator indicator);
+  List<Either<Command, CodeAction>> getCodeActions(final Document document, final XtextResource resource, final CodeActionParams params, final CancelIndicator indicator);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService2.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService2.java
index 1fe55d997..c4e97248e 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService2.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService2.java
@@ -26,7 +26,7 @@ import org.eclipse.xtext.xbase.lib.Pure;
 @SuppressWarnings("all")
 public interface ICodeActionService2 {
   @Accessors
-  public static class Options {
+  class Options {
     private Document document;
     
     private XtextResource resource;
@@ -83,5 +83,5 @@ public interface ICodeActionService2 {
     }
   }
   
-  public abstract List<Either<Command, CodeAction>> getCodeActions(final ICodeActionService2.Options options);
+  List<Either<Command, CodeAction>> getCodeActions(final ICodeActionService2.Options options);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensResolver.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensResolver.java
index 7b9aea39c..49579b480 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensResolver.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensResolver.java
@@ -20,5 +20,5 @@ public interface ICodeLensResolver {
   /**
    * Resolve the given code lens.
    */
-  public abstract CodeLens resolveCodeLens(final Document document, final XtextResource resource, final CodeLens codeLens, final CancelIndicator indicator);
+  CodeLens resolveCodeLens(final Document document, final XtextResource resource, final CodeLens codeLens, final CancelIndicator indicator);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensService.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensService.java
index 7a4411249..4271f9b29 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensService.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codelens/ICodeLensService.java
@@ -22,5 +22,5 @@ public interface ICodeLensService {
   /**
    * compute code lenses for the given context.
    */
-  public abstract List<? extends CodeLens> computeCodeLenses(final Document document, final XtextResource resource, final CodeLensParams params, final CancelIndicator indicator);
+  List<? extends CodeLens> computeCodeLenses(final Document document, final XtextResource resource, final CodeLensParams params, final CancelIndicator indicator);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/commands/IExecutableCommandService.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/commands/IExecutableCommandService.java
index 93e2d2c37..ddb757814 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/commands/IExecutableCommandService.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/commands/IExecutableCommandService.java
@@ -23,16 +23,16 @@ public interface IExecutableCommandService {
    * Called on server initialize.
    * @return the supported commands
    */
-  public abstract List<String> initialize();
+  List<String> initialize();
   
   /**
    * Called on server initialize, only if the client supported dynamicRegistration of commands.
    */
-  public default void initializeDynamicRegistration(final Function1<? super String, ? extends IDisposable> register) {
+  default void initializeDynamicRegistration(final Function1<? super String, ? extends IDisposable> register) {
   }
   
   /**
    * Called when the client wants to execute a registered command.
    */
-  public abstract Object execute(final ExecuteCommandParams params, final ILanguageServerAccess access, final CancelIndicator cancelIndicator);
+  Object execute(final ExecuteCommandParams params, final ILanguageServerAccess access, final CancelIndicator cancelIndicator);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/hover/IHoverService.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/hover/IHoverService.java
index fea7d031a..f214c453f 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/hover/IHoverService.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/hover/IHoverService.java
@@ -24,10 +24,10 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 @ImplementedBy(HoverService.class)
 @SuppressWarnings("all")
 public interface IHoverService {
-  public static final Hover EMPTY_HOVER = new Hover(CollectionLiterals.<Either<String, MarkedString>>emptyList(), null);
+  static final Hover EMPTY_HOVER = new Hover(CollectionLiterals.<Either<String, MarkedString>>emptyList(), null);
   
   /**
    * callback for 'textDocument/hover' requests.
    */
-  public abstract Hover hover(final Document document, final XtextResource resource, final TextDocumentPositionParams params, final CancelIndicator cancelIndicator);
+  Hover hover(final Document document, final XtextResource resource, final TextDocumentPositionParams params, final CancelIndicator cancelIndicator);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/IRenameService2.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/IRenameService2.java
index fffec3439..fa932e4ac 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/IRenameService2.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/IRenameService2.java
@@ -27,7 +27,7 @@ import org.eclipse.xtext.xbase.lib.Pure;
 @SuppressWarnings("all")
 public interface IRenameService2 {
   @Accessors
-  public static class Options {
+  class Options {
     private ILanguageServerAccess languageServerAccess;
     
     private RenameParams renameParams;
@@ -63,7 +63,7 @@ public interface IRenameService2 {
   }
   
   @Accessors
-  public static class PrepareRenameOptions {
+  class PrepareRenameOptions {
     private ILanguageServerAccess languageServerAccess;
     
     private TextDocumentPositionParams params;
@@ -98,7 +98,7 @@ public interface IRenameService2 {
     }
   }
   
-  public abstract WorkspaceEdit rename(final IRenameService2.Options options);
+  WorkspaceEdit rename(final IRenameService2.Options options);
   
   /**
    * Returns a {@link Range range} describing the range of the string to rename and optionally a placeholder text of
@@ -115,5 +115,5 @@ public interface IRenameService2 {
    * This method should be used to set up and to test the validity of a rename operation at a given location.</br>
    * See <a href="https://microsoft.github.io/language-server-protocol/specification#textDocument_prepareRename">{@code textDocument/prepareRename}</a> for more details.
    */
-  public abstract Either<Range, PrepareRenameResult> prepareRename(final IRenameService2.PrepareRenameOptions options);
+  Either<Range, PrepareRenameResult> prepareRename(final IRenameService2.PrepareRenameOptions options);
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/semanticHighlight/ISemanticHighlightingStyleToTokenMapper.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/semanticHighlight/ISemanticHighlightingStyleToTokenMapper.java
index 232a79794..ea0791d93 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/semanticHighlight/ISemanticHighlightingStyleToTokenMapper.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/semanticHighlight/ISemanticHighlightingStyleToTokenMapper.java
@@ -30,7 +30,7 @@ public interface ISemanticHighlightingStyleToTokenMapper {
    * The shared, default NOOP implementation of the semantic style ID to TextMate token mapper.
    */
   @Singleton
-  public static final class Noop implements ISemanticHighlightingStyleToTokenMapper {
+  final class Noop implements ISemanticHighlightingStyleToTokenMapper {
     @Override
     public List<String> toScopes(final String styleId) {
       return SemanticHighlightingRegistry.UNKNOWN_SCOPES;
@@ -45,7 +45,7 @@ public interface ISemanticHighlightingStyleToTokenMapper {
   /**
    * Maps the highlighting style ID to the corresponding TextMate scopes.
    */
-  public abstract List<String> toScopes(final String styleId);
+  List<String> toScopes(final String styleId);
   
   /**
    * Returns with a set of distinct style identifiers that are used by the {@link IHighlightedPositionAcceptor} when calculating
@@ -56,5 +56,5 @@ public interface ISemanticHighlightingStyleToTokenMapper {
    * 
    * @see IHighlightedPositionAcceptor#addPosition
    */
-  public abstract Set<String> getAllStyleIds();
+  Set<String> getAllStyleIds();
 }
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/symbol/IDocumentSymbolService.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/symbol/IDocumentSymbolService.java
index 9c58c7c14..f119c49d9 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/symbol/IDocumentSymbolService.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/symbol/IDocumentSymbolService.java
@@ -32,12 +32,12 @@ import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 @ImplementedBy(IDocumentSymbolService.Noop.class)
 @SuppressWarnings("all")
 public interface IDocumentSymbolService {
-  public static class Noop implements IDocumentSymbolService {
+  class Noop implements IDocumentSymbolService {
     @Override
     public List<Either<SymbolInformation, DocumentSymbol>> getSymbols(final Document document, final XtextResource resource, final DocumentSymbolParams params, final CancelIndicator cancelIndicator) {
       return CollectionLiterals.<Either<SymbolInformation, DocumentSymbol>>emptyList();
     }
   }
   
-  public abstract List<Either<SymbolInformation, DocumentSymbol>> getSymbols(final Document document, final XtextResource resource, final DocumentSymbolParams params, final CancelIndicator cancelIndicator);
+  List<Either<SymbolInformation, DocumentSymbol>> getSymbols(final Document document, final XtextResource resource, final DocumentSymbolParams params, final CancelIndicator cancelIndicator);
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.java
index b29d27a71..93f6e355c 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IGuiceAwareGeneratorComponent.java
@@ -16,5 +16,5 @@ import com.google.inject.Injector;
  */
 @SuppressWarnings("all")
 public interface IGuiceAwareGeneratorComponent {
-  public abstract void initialize(final Injector injector);
+  void initialize(final Injector injector);
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.java
index a635b98ca..eecb95345 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorFragment.java
@@ -16,7 +16,7 @@ import org.eclipse.xtext.xtext.generator.Issues;
  */
 @SuppressWarnings("all")
 public interface IXtextGeneratorFragment extends IGuiceAwareGeneratorComponent {
-  public abstract void checkConfiguration(final Issues issues);
+  void checkConfiguration(final Issues issues);
   
-  public abstract void generate();
+  void generate();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.java
index b9bf602b2..180848993 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/IXtextGeneratorLanguage.java
@@ -20,27 +20,27 @@ import org.eclipse.xtext.xtext.generator.model.StandaloneSetupAccess;
  */
 @SuppressWarnings("all")
 public interface IXtextGeneratorLanguage {
-  public abstract Grammar getGrammar();
+  Grammar getGrammar();
   
-  public abstract List<String> getFileExtensions();
+  List<String> getFileExtensions();
   
-  public abstract StandaloneSetupAccess getRuntimeGenSetup();
+  StandaloneSetupAccess getRuntimeGenSetup();
   
-  public abstract GuiceModuleAccess getRuntimeGenModule();
+  GuiceModuleAccess getRuntimeGenModule();
   
-  public abstract GuiceModuleAccess getIdeGenModule();
+  GuiceModuleAccess getIdeGenModule();
   
-  public abstract GuiceModuleAccess getEclipsePluginGenModule();
+  GuiceModuleAccess getEclipsePluginGenModule();
   
-  public abstract GuiceModuleAccess getIdeaGenModule();
+  GuiceModuleAccess getIdeaGenModule();
   
-  public abstract GuiceModuleAccess getWebGenModule();
+  GuiceModuleAccess getWebGenModule();
   
-  public abstract ResourceSet getResourceSet();
+  ResourceSet getResourceSet();
   
   /**
    * @deprecated Use {@link CodeConfig#isPreferXtendStubs()} instead
    */
   @Deprecated
-  public abstract boolean isGenerateXtendStubs();
+  boolean isGenerateXtendStubs();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/Issues.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/Issues.java
index 135cd7258..4deabdbbc 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/Issues.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/Issues.java
@@ -12,11 +12,11 @@ package org.eclipse.xtext.xtext.generator;
  */
 @SuppressWarnings("all")
 public interface Issues {
-  public abstract void addError(final String message);
+  void addError(final String message);
   
-  public abstract void addError(final String message, final Object source);
+  void addError(final String message, final Object source);
   
-  public abstract void addWarning(final String message);
+  void addWarning(final String message);
   
-  public abstract void addWarning(final String message, final Object source);
+  void addWarning(final String message, final Object source);
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.java
index 04856fd54..24be431a5 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/IXtextGeneratorFileSystemAccess.java
@@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.XtextGeneratorFileSystemAccess;
 @ImplementedBy(XtextGeneratorFileSystemAccess.class)
 @SuppressWarnings("all")
 public interface IXtextGeneratorFileSystemAccess extends IFileSystemAccess2, IGuiceAwareGeneratorComponent {
-  public abstract String getPath();
+  String getPath();
   
-  public abstract boolean isOverwrite();
+  boolean isOverwrite();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.java
index 4df4d5c2c..537ecdaff 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/annotations/IClassAnnotation.java
@@ -27,16 +27,16 @@ public interface IClassAnnotation {
   /**
    * Convert the class annotation to a string suitable for use in Java code generation.
    */
-  public abstract CharSequence generate();
+  CharSequence generate();
   
   /**
    * Determine whether this annotation should be applied to the given Java file.
    */
-  public abstract boolean appliesTo(final JavaFileAccess javaFile);
+  boolean appliesTo(final JavaFileAccess javaFile);
   
   /**
    * Return the qualified name of the annotation interface for use in import declarations,
    * or {@code null} if no import is required.
    */
-  public abstract TypeReference getAnnotationImport();
+  TypeReference getAnnotationImport();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.java
index ca30e7725..67082e57e 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IBundleProjectConfig.java
@@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.ISubProjectConfig;
  */
 @SuppressWarnings("all")
 public interface IBundleProjectConfig extends ISubProjectConfig {
-  public abstract ManifestAccess getManifest();
+  ManifestAccess getManifest();
   
-  public abstract PluginXmlAccess getPluginXml();
+  PluginXmlAccess getPluginXml();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.java
index 3ef213a79..4731f4a32 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IRuntimeProjectConfig.java
@@ -17,17 +17,17 @@ import org.eclipse.xtext.xtext.generator.model.project.IBundleProjectConfig;
  */
 @SuppressWarnings("all")
 public interface IRuntimeProjectConfig extends IBundleProjectConfig {
-  public abstract IXtextGeneratorFileSystemAccess getEcoreModel();
+  IXtextGeneratorFileSystemAccess getEcoreModel();
   
-  public abstract String getEcoreModelFolder();
+  String getEcoreModelFolder();
   
   /**
    * @since 2.13
    */
-  public abstract String getXbaseLibVersionLowerBound();
+  String getXbaseLibVersionLowerBound();
   
   /**
    * @since 2.13
    */
-  public abstract String getXtendLibVersionLowerBound();
+  String getXtendLibVersionLowerBound();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.java
index 74eaa98ba..e364e158d 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/ISubProjectConfig.java
@@ -17,17 +17,17 @@ import org.eclipse.xtext.xtext.generator.model.IXtextGeneratorFileSystemAccess;
  */
 @SuppressWarnings("all")
 public interface ISubProjectConfig extends IGuiceAwareGeneratorComponent {
-  public abstract boolean isEnabled();
+  boolean isEnabled();
   
-  public abstract String getName();
+  String getName();
   
-  public abstract IXtextGeneratorFileSystemAccess getRoot();
+  IXtextGeneratorFileSystemAccess getRoot();
   
-  public abstract IXtextGeneratorFileSystemAccess getMetaInf();
+  IXtextGeneratorFileSystemAccess getMetaInf();
   
-  public abstract IXtextGeneratorFileSystemAccess getSrc();
+  IXtextGeneratorFileSystemAccess getSrc();
   
-  public abstract IXtextGeneratorFileSystemAccess getSrcGen();
+  IXtextGeneratorFileSystemAccess getSrcGen();
   
-  public abstract IXtextGeneratorFileSystemAccess getIcons();
+  IXtextGeneratorFileSystemAccess getIcons();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.java
index c46bd54aa..a08f86d8d 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IWebProjectConfig.java
@@ -17,5 +17,5 @@ import org.eclipse.xtext.xtext.generator.model.project.ISubProjectConfig;
  */
 @SuppressWarnings("all")
 public interface IWebProjectConfig extends ISubProjectConfig {
-  public abstract IXtextGeneratorFileSystemAccess getAssets();
+  IXtextGeneratorFileSystemAccess getAssets();
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.java
index 698ef6176..94edad8f7 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/model/project/IXtextProjectConfig.java
@@ -21,21 +21,21 @@ import org.eclipse.xtext.xtext.generator.model.project.IWebProjectConfig;
  */
 @SuppressWarnings("all")
 public interface IXtextProjectConfig extends IGuiceAwareGeneratorComponent {
-  public abstract IRuntimeProjectConfig getRuntime();
+  IRuntimeProjectConfig getRuntime();
   
-  public abstract IBundleProjectConfig getRuntimeTest();
+  IBundleProjectConfig getRuntimeTest();
   
-  public abstract IBundleProjectConfig getGenericIde();
+  IBundleProjectConfig getGenericIde();
   
-  public abstract IBundleProjectConfig getEclipsePlugin();
+  IBundleProjectConfig getEclipsePlugin();
   
-  public abstract IBundleProjectConfig getEclipsePluginTest();
+  IBundleProjectConfig getEclipsePluginTest();
   
-  public abstract ISubProjectConfig getIdeaPlugin();
+  ISubProjectConfig getIdeaPlugin();
   
-  public abstract IWebProjectConfig getWeb();
+  IWebProjectConfig getWeb();
   
-  public abstract List<? extends ISubProjectConfig> getEnabledProjects();
+  List<? extends ISubProjectConfig> getEnabledProjects();
   
-  public abstract List<? extends ISubProjectConfig> getTestProjects();
+  List<? extends ISubProjectConfig> getTestProjects();
 }
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ProjectsCreator.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ProjectsCreator.java
index 7cb424fdd..3802d9eda 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ProjectsCreator.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ProjectsCreator.java
@@ -11,5 +11,5 @@ import org.eclipse.xtext.xtext.wizard.WizardConfiguration;
 
 @SuppressWarnings("all")
 public interface ProjectsCreator {
-  public abstract void createProjects(final WizardConfiguration config);
+  void createProjects(final WizardConfiguration config);
 }
diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/IShouldGenerate.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/IShouldGenerate.java
index bc7ad8bc4..67e94e07e 100644
--- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/IShouldGenerate.java
+++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/IShouldGenerate.java
@@ -33,7 +33,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
 public interface IShouldGenerate {
   @Beta
   @Singleton
-  public static class OnlyWithoutErrors implements IShouldGenerate {
+  class OnlyWithoutErrors implements IShouldGenerate {
     @Inject
     private IResourceValidator resourceValidator;
     
@@ -56,7 +56,7 @@ public interface IShouldGenerate {
   
   @Beta
   @Singleton
-  public static class Always implements IShouldGenerate {
+  class Always implements IShouldGenerate {
     @Override
     public boolean shouldGenerate(final Resource resource, final CancelIndicator cancelIndicator) {
       return true;
@@ -66,5 +66,5 @@ public interface IShouldGenerate {
   /**
    * whether code should be generated for this resource.
    */
-  public abstract boolean shouldGenerate(final Resource resource, final CancelIndicator cancelIndicator);
+  boolean shouldGenerate(final Resource resource, final CancelIndicator cancelIndicator);
 }
diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java
index 95e73e7f5..d72f7988a 100644
--- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java
+++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/URIBasedFileSystemAccess.java
@@ -42,15 +42,15 @@ public class URIBasedFileSystemAccess extends AbstractFileSystemAccess2 {
     /**
      * @return <code>true</code> if the file can be deleted, false otherwise
      */
-    public abstract boolean beforeDelete(final URI changed);
+    boolean beforeDelete(final URI changed);
   }
   
   public interface BeforeWrite {
-    public abstract InputStream beforeWrite(final URI changed, final String outputCfgName, final InputStream in);
+    InputStream beforeWrite(final URI changed, final String outputCfgName, final InputStream in);
   }
   
   public interface BeforeRead {
-    public abstract InputStream beforeRead(final URI changed, final InputStream in);
+    InputStream beforeRead(final URI changed, final InputStream in);
   }
   
   @Accessors
diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.java
index 50d6659ff..3116880ac 100644
--- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.java
+++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/IResourceStorageFacade.java
@@ -27,12 +27,12 @@ public interface IResourceStorageFacade {
   /**
    * @return whether the given resource should and can be loaded from stored resource state
    */
-  public abstract boolean shouldLoadFromStorage(final StorageAwareResource resource);
+  boolean shouldLoadFromStorage(final StorageAwareResource resource);
   
   /**
    * @return whether storage data exists for the given URI
    */
-  public abstract boolean hasStorageFor(final URI uri);
+  boolean hasStorageFor(final URI uri);
   
   /**
    * Finds or creates a ResourceStorageLoadable for the given resource.
@@ -41,20 +41,20 @@ public interface IResourceStorageFacade {
    * 
    * @return an IResourceStorageLoadable
    */
-  public abstract ResourceStorageLoadable getOrCreateResourceStorageLoadable(final StorageAwareResource resource);
+  ResourceStorageLoadable getOrCreateResourceStorageLoadable(final StorageAwareResource resource);
   
   /**
    * Saves the resource using the given file system access.
    */
-  public abstract void saveResource(final StorageAwareResource resource, final IFileSystemAccessExtension3 fsa);
+  void saveResource(final StorageAwareResource resource, final IFileSystemAccessExtension3 fsa);
   
   /**
    * Creates a fresh ResourceStorageWritable wrapping the given OutputStream
    */
-  public abstract ResourceStorageWritable createResourceStorageWritable(final OutputStream outputStream);
+  ResourceStorageWritable createResourceStorageWritable(final OutputStream outputStream);
   
   /**
    * Creates a fresh ResourceStorageLoadable wrapping the given InputStream
    */
-  public abstract ResourceStorageLoadable createResourceStorageLoadable(final InputStream inputStream);
+  ResourceStorageLoadable createResourceStorageLoadable(final InputStream inputStream);
 }
diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescriptionProvider.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescriptionProvider.java
index 36ef44020..e1ad592dd 100644
--- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescriptionProvider.java
+++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescriptionProvider.java
@@ -14,5 +14,5 @@ import org.eclipse.xtext.resource.persistence.SerializableEObjectDescription;
  */
 @SuppressWarnings("all")
 public interface SerializableEObjectDescriptionProvider {
-  public abstract SerializableEObjectDescription toSerializableEObjectDescription();
+  SerializableEObjectDescription toSerializableEObjectDescription();
 }