Make name of LightVirtualFile @NlsSafe

GitOrigin-RevId: eee5a55d9ffdcb3fe04a455a556d31f108467260
This commit is contained in:
Petr Kudriavtsev
2020-08-18 21:45:08 +00:00
committed by intellij-monorepo-bot
parent 543f8aeb36
commit ae0b2c41ae
2 changed files with 10 additions and 9 deletions
@@ -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,
@@ -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;
}