diff --git a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
index a0a5b0704..278f497ac 100644
--- a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
@@ -19,7 +19,7 @@ import javax.swing.*;
 public class DemoFacetType extends FacetType<DemoFacet, DemoFacetConfiguration> {
   public static final String FACET_ID = "DEMO_FACET_ID";
   public static final String FACET_NAME = "SDK Facet";
-  public static final FacetTypeId<DemoFacet> DEMO_FACET_TYPE_ID = new FacetTypeId<DemoFacet>(FACET_ID);
+  public static final FacetTypeId<DemoFacet> DEMO_FACET_TYPE_ID = new FacetTypeId<>(FACET_ID);
 
   public DemoFacetType() {
     super(DEMO_FACET_TYPE_ID, FACET_ID, FACET_NAME);
diff --git a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java
index f8fc603d4..d2ca2913a 100644
--- a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java
+++ b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java
@@ -76,14 +76,14 @@ public class ImagesProjectNode extends AbstractTreeNode<VirtualFile> {
   @NotNull
   @Override
   public Collection<? extends AbstractTreeNode> getChildren() {
-    final List<VirtualFile> files = new ArrayList<VirtualFile>(0);
+    final List<VirtualFile> files = new ArrayList<>(0);
     for (VirtualFile file : getValue().getChildren()) {
       if (getImagesFiles(myProject).contains(file)) {
         files.add(file);
       }
     }
     if (files.isEmpty()) return Collections.emptyList();
-    final List<AbstractTreeNode> nodes = new ArrayList<AbstractTreeNode>(files.size());
+    final List<AbstractTreeNode> nodes = new ArrayList<>(files.size());
     final boolean alwaysOnTop = ProjectView.getInstance(myProject).isFoldersAlwaysOnTop("");
     Collections.sort(files, (o1, o2) -> {
       if (alwaysOnTop) {
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java
index 9de3e13c0..04e8ad30a 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java
@@ -23,7 +23,7 @@ public class SimpleBlock extends AbstractBlock {
   
   @Override
   protected List<Block> buildChildren() {
-    List<Block> blocks = new ArrayList<Block>();
+    List<Block> blocks = new ArrayList<>();
     ASTNode child = myNode.getFirstChildNode();
     while (child != null) {
       if (child.getElementType() != TokenType.WHITE_SPACE) {
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java
index ea1859a10..eb3d1fa91 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java
@@ -14,7 +14,7 @@ public class SimpleChooseByNameContributor implements ChooseByNameContributor {
   @Override
   public String[] getNames(Project project, boolean includeNonProjectItems) {
     List<SimpleProperty> properties = SimpleUtil.findProperties(project);
-    List<String> names = new ArrayList<String>(properties.size());
+    List<String> names = new ArrayList<>(properties.size());
     for (SimpleProperty property : properties) {
       if (property.getKey() != null && property.getKey().length() > 0) {
         names.add(property.getKey());
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java
index c1a8df505..bcd0f8bca 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java
@@ -21,7 +21,7 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware
     // Initialize the group of folding regions that will expand/collapse together.
     FoldingGroup group = FoldingGroup.newGroup(SimpleAnnotator.SIMPLE_PREFIX_STR);
     // Initialize the list of folding regions
-    List< FoldingDescriptor > descriptors = new ArrayList< FoldingDescriptor >();
+    List< FoldingDescriptor > descriptors = new ArrayList<>();
     // Get a collection of the literal expressions in the document below root
     Collection< PsiLiteralExpression > literalExpressions =
           PsiTreeUtil.findChildrenOfType(root, PsiLiteralExpression.class);
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java
index 317c07706..8406b80f5 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java
@@ -24,7 +24,7 @@ public class SimpleReference extends PsiReferenceBase<PsiElement> implements Psi
   public ResolveResult[] multiResolve(boolean incompleteCode) {
     Project project = myElement.getProject();
     final List<SimpleProperty> properties = SimpleUtil.findProperties(project, key);
-    List<ResolveResult> results = new ArrayList<ResolveResult>();
+    List<ResolveResult> results = new ArrayList<>();
     for (SimpleProperty property : properties) {
       results.add(new PsiElementResolveResult(property));
     }
@@ -43,7 +43,7 @@ public class SimpleReference extends PsiReferenceBase<PsiElement> implements Psi
   public Object[] getVariants() {
     Project project = myElement.getProject();
     List<SimpleProperty> properties = SimpleUtil.findProperties(project);
-    List<LookupElement> variants = new ArrayList<LookupElement>();
+    List<LookupElement> variants = new ArrayList<>();
     for (final SimpleProperty property : properties) {
       if (property.getKey() != null && property.getKey().length() > 0) {
         variants.add(LookupElementBuilder
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
index 1afe7bcc9..81bc131ad 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
@@ -63,7 +63,7 @@ public class SimpleStructureViewElement implements StructureViewTreeElement, Sor
   public TreeElement[] getChildren() {
     if (myElement instanceof SimpleFile) {
       List<SimpleProperty> properties = PsiTreeUtil.getChildrenOfTypeAsList(myElement, SimpleProperty.class);
-      List<TreeElement> treeElements = new ArrayList<TreeElement>(properties.size());
+      List<TreeElement> treeElements = new ArrayList<>(properties.size());
       for (SimpleProperty property : properties) {
         treeElements.add(new SimpleStructureViewElement((SimplePropertyImpl) property));
       }
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
index 2004b9eca..e182e7408 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java
@@ -36,7 +36,7 @@ public class SimpleUtil {
   }
   
   public static List<SimpleProperty> findProperties(Project project) {
-    List<SimpleProperty> result = new ArrayList<SimpleProperty>();
+    List<SimpleProperty> result = new ArrayList<>();
     Collection<VirtualFile> virtualFiles =
           FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project));
     for (VirtualFile virtualFile : virtualFiles) {