EA-127640 - IAE: SdkConfigurationUtil.$$$reportNull$$$

@NotNull added

java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java

@@ -215,6 +215,7 @@ public class JavaSdkImpl extends JavaSdk {
     return JdkUtil.checkForJdk(path);
   }
 
+  @NotNull
   @Override
   public String suggestSdkName(String currentSdkName, String sdkHome) {
     return suggestJavaSdkName(this, currentSdkName, sdkHome);

platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java

@@ -74,6 +74,7 @@ public abstract class SdkType implements SdkTypeId {
     return null;
   }
 
+  @NotNull
   public abstract String suggestSdkName(String currentSdkName, String sdkHome);
 
   /**

platform/lang-api/src/com/intellij/openapi/projectRoots/SimpleJavaSdkType.java

@@ -75,6 +75,7 @@ public class SimpleJavaSdkType extends SdkType implements JavaSdkType {
     return JdkUtil.checkForJdk(path);
   }
 
+  @NotNull
   @Override
   public String suggestSdkName(String currentSdkName, String sdkHome) {
     return suggestJavaSdkName(this, currentSdkName, sdkHome);

platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java

@@ -59,6 +59,7 @@ public class UnknownSdkType extends SdkType{
     return "";
   }
 
+  @NotNull
   @Override
   public String suggestSdkName(String currentSdkName, String sdkHome) {
     return currentSdkName;

platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java

@@ -651,7 +651,6 @@ public class CommentByLineCommentHandler extends MultiCaretCodeInsightActionHand
       if (endOffset == offset && block.startLine != block.endLine) return true;
       final int textLength = document.getTextLength();
       final CharSequence chars = document.getCharsSequence();
-      offset = CharArrayUtil.shiftForward(chars, offset, " \t");
       if (endOffset == textLength) {
         final int shifted = CharArrayUtil.shiftBackward(chars, textLength - 1, " \t") + 1;
         if (shifted < textLength) endOffset = shifted;

plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java

@@ -142,6 +142,7 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
     return null;
   }
 
+  @NotNull
   @Override
   public String suggestSdkName(String currentSdkName, String sdkHome) {
     if (PsiUtil.isPathToIntelliJIdeaSources(sdkHome)) return "Local IDEA [" + sdkHome + "]";

python/src/com/jetbrains/python/sdk/PythonSdkType.java

@@ -374,6 +374,7 @@ public final class PythonSdkType extends SdkType {
     }
   }
 
+  @NotNull
   @Override
   public String suggestSdkName(final String currentSdkName, final String sdkHome) {
     final String name = StringUtil.notNullize(suggestBaseSdkName(sdkHome), "Unknown");

xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java

@@ -270,6 +270,10 @@ public class XmlBlock extends AbstractXmlBlock {
       return createDefaultSpace(true, false);
     }
 
+    if (type1 == XmlElementType.XML_COMMENT) {
+      return createDefaultSpace(true, false);
+    }
+
     return createDefaultSpace(false, false);
   }