From 13dcd3d38bc223078f9ecf766318ba152c35b8d4 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 12 Apr 2017 14:31:56 +0300
Subject: [PATCH] cleanup

---
 .../intellij/psi/stubs/SerializationManager.java   |  8 +-------
 .../formatter/PythonFormattingModelBuilder.java    | 14 ++++++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/platform/indexing-api/src/com/intellij/psi/stubs/SerializationManager.java b/platform/indexing-api/src/com/intellij/psi/stubs/SerializationManager.java
index b72f8bb57a5c..c6ccb97f3d24 100644
--- a/platform/indexing-api/src/com/intellij/psi/stubs/SerializationManager.java
+++ b/platform/indexing-api/src/com/intellij/psi/stubs/SerializationManager.java
@@ -22,7 +22,6 @@ package com.intellij.psi.stubs;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.StubFileElementType;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,12 +44,7 @@ public abstract class SerializationManager {
     synchronized (this) {
       if (mySerializersLoaded) return;
       IStubElementType.loadRegisteredStubElementTypes();
-      final IElementType[] stubElementTypes = IElementType.enumerate(new IElementType.Predicate() {
-        @Override
-        public boolean matches(@NotNull final IElementType type) {
-          return type instanceof StubSerializer;
-        }
-      });
+      final IElementType[] stubElementTypes = IElementType.enumerate(type -> type instanceof StubSerializer);
       for (IElementType type : stubElementTypes) {
         if (type instanceof StubFileElementType &&
             StubFileElementType.DEFAULT_EXTERNAL_ID.equals(((StubFileElementType)type).getExternalId())) {
diff --git a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
index 71100d5f408b..970bb3380f45 100644
--- a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
+++ b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
@@ -38,7 +38,7 @@ import static com.jetbrains.python.PyTokenTypes.*;
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, CustomFormattingModelBuilder {
   private static final boolean DUMP_FORMATTING_AST = false;
-  public static final TokenSet STATEMENT_OR_DECLARATION = PythonDialectsTokenSetProvider.INSTANCE.getStatementTokens();
+  static final TokenSet STATEMENT_OR_DECLARATION = PythonDialectsTokenSetProvider.INSTANCE.getStatementTokens();
 
   @NotNull
   @Override
@@ -66,6 +66,7 @@ public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, C
     return null;
   }
 
+  @Override
   @NotNull
   public FormattingModel createModel(final PsiElement element, final CodeStyleSettings settings) {
     return createModel(element, settings, FormattingMode.REFORMAT);
@@ -163,14 +164,10 @@ public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, C
 
   private static TokenSet allButLambda() {
     final PythonLanguage pythonLanguage = PythonLanguage.getInstance();
-    return TokenSet.create(IElementType.enumerate(new IElementType.Predicate() {
-      @Override
-      public boolean matches(@NotNull IElementType type) {
-        return type != LAMBDA_KEYWORD && type.getLanguage().isKindOf(pythonLanguage);
-      }
-    }));
+    return TokenSet.create(IElementType.enumerate(type -> type != LAMBDA_KEYWORD && type.getLanguage().isKindOf(pythonLanguage)));
   }
 
+  @Override
   public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) {
     return null;
   }
@@ -180,12 +177,13 @@ public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, C
       for (int i = 0; i < indent; i++) {
         System.out.print(" ");
       }
-      System.out.println(node.toString() + " " + node.getTextRange().toString());
+      System.out.println(node + " " + node.getTextRange());
       printAST(node.getFirstChildNode(), indent + 2);
       node = node.getTreeNext();
     }
   }
 
+  @Override
   public boolean isEngagedToFormat(PsiElement context) {
     PsiFile file = context.getContainingFile();
     return file != null && file.getLanguage() == PythonLanguage.getInstance();