From c40aea3728dd56569cb3290bfaee1d91e13bd608 Mon Sep 17 00:00:00 2001
From: Alexey Utkin <alexey.utkin@jetbrains.com>
Date: Wed, 19 Aug 2020 00:35:32 +0300
Subject: [PATCH] [i18n] html quick doc

GitOrigin-RevId: 39c74d93b1e2b787bfd5f3d93951fde3560804cb
---
 .../jsonSchema/extension/JsonSchemaProviderFactory.java     | 3 ++-
 .../com/intellij/codeEditor/printing/HTMLTextPainter.java   | 6 ++++--
 .../execution/configurations/GeneralCommandLine.java        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java
index 70df36ddfe70..d21824f7478a 100644
--- a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java
+++ b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaProviderFactory.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URL;
@@ -26,7 +27,7 @@ public interface JsonSchemaProviderFactory {
    *                      See {@link Class#getResource(String)} for more details
    * @return VirtualFile instance, or null if not found
    */
-  static VirtualFile getResourceFile(@NotNull Class baseClass, @NotNull String resourcePath) {
+  static VirtualFile getResourceFile(@NotNull Class baseClass, @NonNls @NotNull String resourcePath) {
     URL url = baseClass.getResource(resourcePath);
     if (url == null) {
       LOG.error("Cannot find resource " + resourcePath);
diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
index 98b99b7d4b83..2f73b96a38b4 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
@@ -14,6 +14,7 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.NlsSafe;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -401,18 +402,19 @@ public final class HTMLTextPainter {
    * @return the HTML fragment in {@code pre}-tag container
    */
   @NotNull
+  @NlsSafe
   public static String convertCodeFragmentToHTMLFragmentWithInlineStyles(@NotNull PsiElement context, @NotNull String codeFragment) {
     try {
       StringWriter writer = new StringWriter();
       new HTMLTextPainter(context, codeFragment).paint(null, writer, false);
-      return writer.toString();
+      return writer.toString(); //NON-NLS
     }
     catch (ProcessCanceledException cancel) {
       throw cancel;
     }
     catch (Throwable e) {
       LOG.error(e);
-      return String.format("<pre>%s</pre>\n", codeFragment);
+      return String.format("<pre>%s</pre>\n", codeFragment); //NON-NLS
     }
   }
 }
diff --git a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java
index 80103f96e10d..74f730e11e50 100644
--- a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java
+++ b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java
@@ -253,7 +253,7 @@ public class GeneralCommandLine implements UserDataHolder {
     return this;
   }
 
-  public void addParameter(@NotNull @NonNls String parameter) {
+  public void addParameter(@NonNls @NotNull String parameter) {
     myProgramParams.add(parameter);
   }