From 2fba5739399710ad72b730e39b9f19ed29186a0a Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 23 Jun 2017 17:53:01 +0200
Subject: [PATCH] raise javadoc awareness of LanguageSubstitutor
 (IDEA-CR-22159)

---
 platform/core-api/src/com/intellij/lang/Language.java         | 4 +++-
 .../src/com/intellij/openapi/fileTypes/LanguageFileType.java  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/lang/Language.java b/platform/core-api/src/com/intellij/lang/Language.java
index f35b1685f9db..af20a84ac586 100644
--- a/platform/core-api/src/com/intellij/lang/Language.java
+++ b/platform/core-api/src/com/intellij/lang/Language.java
@@ -36,7 +36,9 @@ import java.util.concurrent.ConcurrentMap;
  * and its register instance wrapped with {@link LanguageFileType} instance via {@code FileTypeManager.getInstance().registerFileType()}.
  * There should be exactly one instance of each Language.
  * It is usually created when creating {@link LanguageFileType} and can be retrieved later with {@link #findInstance(Class)}.
- * For the list of standard languages, see {@code com.intellij.lang.StdLanguages}.
+ * For the list of standard languages, see {@code com.intellij.lang.StdLanguages}.<p/>
+ *
+ * The language coming from file type can be changed by {@link com.intellij.psi.LanguageSubstitutor}
  */
 public abstract class Language extends UserDataHolderBase {
   private static final Logger LOG = Logger.getInstance("#com.intellij.lang.Language");
diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/LanguageFileType.java b/platform/core-api/src/com/intellij/openapi/fileTypes/LanguageFileType.java
index be19dd97e2eb..72c6ba00202e 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/LanguageFileType.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/LanguageFileType.java
@@ -25,6 +25,7 @@ import java.nio.charset.Charset;
 
 /**
  * Kind of file types capable to provide {@link Language}.
+ * Note that the associated language can still be overridden by a {@link com.intellij.psi.LanguageSubstitutor}.
  */
 public abstract class LanguageFileType implements FileType{
   private final Language myLanguage;