From 315c2f82285fda82bde2aef0d9cb37633dd92a86 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 30 Mar 2015 17:53:00 +0300
Subject: [PATCH] Deleted registry keys, minor refactoring

---
 .../autodetect/ContinuationIndentDetector.java   | 16 +++++-----------
 platform/util/resources/misc/registry.properties |  3 ---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java
index 5d8f517dc979..74cb08bc3a23 100644
--- a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java
+++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.codeStyle.autodetect;
 
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Stack;
 import com.intellij.util.text.CharArrayUtil;
@@ -36,7 +35,10 @@ class ContinuationIndentDetector {
   public void feedLineStartingAt(int startOffset) {
     if (myIncorrectBracketsOrder) return;
 
-    for (int i = startOffset; i < getLineEndOffset(startOffset); i++) {
+    int lineEndOffset = CharArrayUtil.indexOf(myText, "\n", startOffset, myLength);
+    if (lineEndOffset < 0) lineEndOffset = myLength;
+
+    for (int i = startOffset; i < lineEndOffset; i++) {
       Bracket bracket = Bracket.forChar(myText.charAt(i));
       if (bracket == null) continue;
       processBracket(bracket);
@@ -58,20 +60,12 @@ class ContinuationIndentDetector {
   }
 
   public boolean isContinuationIndent() {
-    if (!shouldDetect() || myIncorrectBracketsOrder) {
+    if (myIncorrectBracketsOrder) {
       return false;
     }
     return myOpenedBrackets.contains(Bracket.LPARENTH);
   }
 
-  private boolean shouldDetect() {
-    return Registry.is("detect.indent.ignore.continuation.indented.lines");
-  }
-
-  private int getLineEndOffset(int lineStartOffset) {
-    int lineEndOffset = CharArrayUtil.indexOf(myText, "\n", lineStartOffset, myLength);
-    return lineEndOffset < 0 ? myLength : lineEndOffset;
-  }
 
   private enum Bracket {
     LBRACE('{') {
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 9a07909abaa1..c2dd64c84412 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -535,9 +535,6 @@ editor.xcode.like.scrollbar.description=Enables auto-hideable Xcode-like editor
 editor.config.stop.at.project.root=true
 editor.config.stop.at.project.root.description=Stops searching for .editorconfig at project root (requires project reopening)
 
-detect.indent.ignore.continuation.indented.lines=false
-detect.indent.ignore.continuation.indented.lines.description=When detecting file indent, ignore continuation indented lines
-
 JDK8042508.bug.fixed=false
 JDK8042508.bug.fixed.description=Disable check for type variable until javac bug is fixed