fix Format members visibility

GitOrigin-RevId: 2a229b52bb24936dace31a467c15c2f0a223cb58
This commit is contained in:
Vladimir Krivosheev
2025-02-16 09:12:36 +01:00
committed by intellij-monorepo-bot
parent c00404ad15
commit 7f5c1ca4ef
6 changed files with 13 additions and 10 deletions

View File

@@ -610,6 +610,8 @@ org.jdom.output.EscapeStrategy
- a:shouldEscape(C):Z
f:org.jdom.output.Format
- java.lang.Cloneable
- expandEmptyElements:Z
- mode:org.jdom.output.Format$TextMode
- clone():org.jdom.output.Format
- s:compact(java.lang.String):java.lang.String
- s:getCompactFormat():org.jdom.output.Format

View File

@@ -372,7 +372,7 @@ public final class Format implements Cloneable {
* Whether or not to expand empty elements to
* &lt;tagName&gt;&lt;/tagName&gt; - default is <code>false</code>
*/
boolean expandEmptyElements = false;
public boolean expandEmptyElements = false;
/**
* Whether TrAX output escaping disabling/enabling PIs are ignored
@@ -383,7 +383,7 @@ public final class Format implements Cloneable {
/**
* text handling mode
*/
TextMode mode = TextMode.PRESERVE;
public TextMode mode = TextMode.PRESERVE;
/**
* entity escape logic

View File

@@ -1351,7 +1351,6 @@ public final class EclipseXMLOutputter extends BaseXmlOutputter implements Clone
return (
"XMLOutputter[omitDeclaration = " + false + ", " +
"encoding = " + CharsetToolkit.UTF8 + ", " +
"omitEncoding = " + false + ", " +
"indent = '" + "\t" + "'" + ", " +
"expandEmptyElements = " + userFormat.expandEmptyElements + ", " +

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.console
@@ -33,7 +33,6 @@ import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.psi.PsiFileFactory
import com.intellij.psi.PsiManager
import com.intellij.psi.impl.PsiFileFactoryImpl
@@ -68,6 +67,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsSource
import java.awt.Color
import java.awt.Font
import java.nio.charset.StandardCharsets
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import kotlin.properties.Delegates
@@ -286,7 +286,7 @@ class KotlinConsoleRunner(
"${consoleView.virtualFile.name}$lineNumber${KotlinParserDefinition.STD_SCRIPT_EXT}",
KotlinLanguage.INSTANCE, text
).apply {
charset = CharsetToolkit.UTF8_CHARSET
charset = StandardCharsets.UTF_8
isWritable = false
}
val psiFile = (PsiFileFactory.getInstance(project) as PsiFileFactoryImpl).trySetupPsiForFile(

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.test;
@@ -57,6 +57,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.*;
import java.util.regex.Matcher;
@@ -192,7 +193,7 @@ public final class KotlinTestUtils {
shortName = shortName.substring(shortName.lastIndexOf('\\') + 1);
LightVirtualFile virtualFile = new LightVirtualFile(shortName, KotlinLanguage.INSTANCE, StringUtilRt.convertLineSeparators(text));
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
virtualFile.setCharset(StandardCharsets.UTF_8);
PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project);
return (KtFile) factory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false);
}

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.test.testFramework;
@@ -42,6 +42,7 @@ import org.picocontainer.ComponentAdapter;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Set;
@SuppressWarnings("ALL")
@@ -233,7 +234,7 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture {
protected PsiFile createFile(@NonNls String name, String text) {
LightVirtualFile virtualFile = new LightVirtualFile(name, myLanguage, text);
virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
virtualFile.setCharset(StandardCharsets.UTF_8);
return createFile(virtualFile);
}