From ae0b2c41ae0474d22dadb99ee0866eddf6b56f40 Mon Sep 17 00:00:00 2001 From: Petr Kudriavtsev Date: Wed, 19 Aug 2020 00:33:22 +0300 Subject: [PATCH] Make name of LightVirtualFile @NlsSafe GitOrigin-RevId: eee5a55d9ffdcb3fe04a455a556d31f108467260 --- .../com/intellij/testFramework/LightVirtualFile.java | 11 ++++++----- .../intellij/testFramework/LightVirtualFileBase.java | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java b/platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java index 485d29b999b2..7c70224d4a8a 100644 --- a/platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java +++ b/platform/core-api/src/com/intellij/testFramework/LightVirtualFile.java @@ -5,6 +5,7 @@ import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.CharsetUtil; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeRegistry; +import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; @@ -26,15 +27,15 @@ public class LightVirtualFile extends LightVirtualFileBase { this(""); } - public LightVirtualFile(@NotNull String name) { + public LightVirtualFile(@NlsSafe @NotNull String name) { this(name, ""); } - public LightVirtualFile(@NotNull String name, @NotNull CharSequence content) { + public LightVirtualFile(@NlsSafe @NotNull String name, @NotNull CharSequence content) { this(name, null, content, LocalTimeCounter.currentTime()); } - public LightVirtualFile(@NotNull String name, FileType fileType, @NotNull CharSequence text) { + public LightVirtualFile(@NlsSafe @NotNull String name, FileType fileType, @NotNull CharSequence text) { this(name, fileType, text, LocalTimeCounter.currentTime()); } @@ -43,11 +44,11 @@ public class LightVirtualFile extends LightVirtualFileBase { setCharset(original.getCharset()); } - public LightVirtualFile(@NotNull String name, FileType fileType, @NotNull CharSequence text, long modificationStamp) { + public LightVirtualFile(@NlsSafe @NotNull String name, FileType fileType, @NotNull CharSequence text, long modificationStamp) { this(name, fileType, text, CharsetUtil.extractCharsetFromFileContent(null, null, fileType, text), modificationStamp); } - public LightVirtualFile(@NotNull String name, + public LightVirtualFile(@NlsSafe @NotNull String name, FileType fileType, @NotNull CharSequence text, Charset charset, diff --git a/platform/core-api/src/com/intellij/testFramework/LightVirtualFileBase.java b/platform/core-api/src/com/intellij/testFramework/LightVirtualFileBase.java index 3d10cb7a7252..b9939a7dc0e6 100644 --- a/platform/core-api/src/com/intellij/testFramework/LightVirtualFileBase.java +++ b/platform/core-api/src/com/intellij/testFramework/LightVirtualFileBase.java @@ -2,6 +2,7 @@ package com.intellij.testFramework; import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.vfs.DeprecatedVirtualFileSystem; import com.intellij.openapi.vfs.NonPhysicalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -18,13 +19,13 @@ import java.io.IOException; */ public abstract class LightVirtualFileBase extends VirtualFile { private FileType myFileType; - private String myName; + private @NlsSafe String myName; private long myModStamp; private boolean myIsWritable = true; private boolean myValid = true; private VirtualFile myOriginalFile; - public LightVirtualFileBase(final String name, final FileType fileType, final long modificationStamp) { + public LightVirtualFileBase(final @NlsSafe String name, final FileType fileType, final long modificationStamp) { myName = name; myFileType = fileType; myModStamp = modificationStamp; @@ -92,8 +93,7 @@ public abstract class LightVirtualFileBase extends VirtualFile { } @Override - @NotNull - public String getName() { + public @NlsSafe @NotNull String getName() { return myName; }