diff --git a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF index 959010f52..2dfb6f56b 100644 --- a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF +++ b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for language server bundle (Incubation) Bundle-SymbolicName: org.eclipse.lsp4e.test;singleton:=true -Bundle-Version: 0.15.14.qualifier +Bundle-Version: 0.15.15.qualifier Fragment-Host: org.eclipse.lsp4e Bundle-Vendor: Eclipse.org Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.lsp4e.test/pom.xml b/org.eclipse.lsp4e.test/pom.xml index 5149165f6..bd8e32275 100644 --- a/org.eclipse.lsp4e.test/pom.xml +++ b/org.eclipse.lsp4e.test/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lsp4e.test eclipse-test-plugin - 0.15.14-SNAPSHOT + 0.15.15-SNAPSHOT diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java index 488381cf4..ebd1ce809 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java @@ -13,7 +13,10 @@ *******************************************************************************/ package org.eclipse.lsp4e.test.edit; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,7 +33,6 @@ import java.util.Random; import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.internal.utils.FileUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -374,9 +376,7 @@ private String readContent(IFile targetFile) throws IOException, CoreException { try (ByteArrayOutputStream stream = new ByteArrayOutputStream( (int) targetFile.getLocation().toFile().length()); InputStream contentStream = targetFile.getContents();) { - FileUtil.transferStreams(contentStream, stream, targetFile.getFullPath().toString(), - new NullProgressMonitor()); - // targetFile.getContents().transferTo(stream); + contentStream.transferTo(stream); return new String(stream.toByteArray()); } } diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java index 17a96dd65..9a97054d9 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java @@ -57,7 +57,6 @@ import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.IFileSystem; -import org.eclipse.core.internal.utils.FileUtil; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; @@ -1164,7 +1163,7 @@ private static CompositeChange toCompositeChange(WorkspaceEdit wsEdit, String na if (oldFile != null && oldFile.exists()) { try (var stream = new ByteArrayOutputStream((int) oldFile.getLocation().toFile().length()); InputStream inputStream = oldFile.getContents();) { - FileUtil.transferStreams(inputStream, stream, newURI.toString(), null); + inputStream.transferTo(stream); content = new String(stream.toByteArray()); encoding = oldFile.getCharset(); } catch (IOException | CoreException e) {