sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1397 from eclipse/cd_issue1394a

Browse source 
[#1394] marked more elements to be removed in 2.22
This commit is contained in:
Christian Dietrich 2020-02-22 18:55:26 +01:00 committed by GitHub
commit fd6fbc442b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/BuildManager.java
View file

@ -144,8 +144,9 @@ public class BuildManager {
/**
* @deprecated this method is no longer used
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
public List<IResourceDescription.Delta> doBuild(List<URI> dirtyFiles, List<URI> deletedFiles,
CancelIndicator cancelIndicator) {
return submit(dirtyFiles, deletedFiles).build(cancelIndicator);

6
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/UriExtensions.xtend
View file

@ -36,16 +36,18 @@ class UriExtensions extends org.eclipse.xtext.util.UriExtensions {
/**
* @deprecated use #toUriString(URI)
* This method is scheduled to be removed with 2.22.
*/
@Deprecated()
@Deprecated//(forRemoval=true)
def String toPath(URI uri) {
return toUriString(uri)
}
/**
* @deprecated use toUriString(URI)
* This method is scheduled to be removed with 2.22.
*/
@Deprecated()
@Deprecated//(forRemoval=true)
def String toPath(java.net.URI uri) {
return toUriString(uri)
}

10
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/WorkspaceManager.java
View file

@ -368,8 +368,9 @@ public class WorkspaceManager {
/**
* @deprecated the server should not apply {@link TextEdit}s but {@link TextDocumentContentChangeEvent}s. Use
* {@link #didChangeTextDocumentContent(URI, Integer, Iterable)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
public List<IResourceDescription.Delta> didChange(URI uri, Integer version, Iterable<TextEdit> changes,
CancelIndicator cancelIndicator) {
return didChange(uri, version, changes).build(cancelIndicator);
@ -380,8 +381,9 @@ public class WorkspaceManager {
* unused
* @deprecated the server should not apply {@link TextEdit}s but {@link TextDocumentContentChangeEvent}s. Use
* {@link #didChangeTextDocumentContent(URI, Integer, Iterable)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
public BuildManager.Buildable didChange(URI uri, Integer version, Iterable<TextEdit> changes) {
Document contents = openDocuments.get(uri);
if (contents == null) {
@ -433,9 +435,9 @@ public class WorkspaceManager {
}
/**
* @deprecated this method is no longer called
* @deprecated this method is no longer called. This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
public List<IResourceDescription.Delta> didClose(URI uri, CancelIndicator cancelIndicator) {
return didClose(uri).build(cancelIndicator);
}

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.xtend
View file

@ -22,8 +22,9 @@ import org.eclipse.xtext.util.CancelIndicator
/**
* @author Sven Efftinge - Initial contribution and API
* @deprecated use {@link ICodeActionService2} instead
* This interface is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
interface ICodeActionService {
def List<Either<Command, CodeAction>> getCodeActions(Document document, XtextResource resource, CodeActionParams params, CancelIndicator indicator)

1
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/coloring/IColoringService.java
View file

@ -27,6 +27,7 @@ import com.google.inject.ImplementedBy;
*
* @author akos.kitta - Initial contribution and API
* @deprecated use the {@link ISemanticHighlightingCalculator} and the {@link ISemanticHighlightingStyleToTokenMapper} instead.
* This interface is scheduled to be removed with 2.22.
*/
@Deprecated
@ImplementedBy(IColoringService.Noop.class)

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/formatting/FormattingService.xtend
View file

@ -80,8 +80,9 @@ class FormattingService {
/**
* @deprecated use {@link #format(XtextResource, Document, int, int, FormattingOptions)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
def List<TextEdit> format(XtextResource resource, Document document, int offset, int length) {
format(resource, document, offset, length, null)
}

2
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/occurrences/IDocumentHighlightService.java
View file

@ -68,7 +68,7 @@ public interface IDocumentHighlightService {
* empty list but never returns with {@code null}.
* @deprecated This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
List<? extends DocumentHighlight> getDocumentHighlights(final XtextResource resource, final int offset);
}

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/rename/ChangeConverter.xtend
View file

@ -28,8 +28,9 @@ import org.eclipse.xtext.util.IAcceptor
* @author koehnlein - Initial contribution and API
* @since 2.13
* @deprecated use {@link ChangeConverter2} instead
* This class is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
class ChangeConverter implements IAcceptor<IEmfResourceChange> {
static class Factory {

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/rename/IRenameService.java
View file

@ -17,8 +17,9 @@ import org.eclipse.xtext.util.CancelIndicator;
* @author koehnlein - Initial contribution and API
* @since 2.13
* @deprecated use {@link IRenameService2} instead.
* This interface is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
public interface IRenameService {
@Deprecated
WorkspaceEdit rename(WorkspaceManager workspaceManager, RenameParams renameParams, CancelIndicator cancelIndicator);

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/rename/RenameService.xtend
View file

@ -29,8 +29,9 @@ import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider
* @author koehnlein - Initial contribution and API
* @since 2.13
* @deprecated use {@link RenameService2} instead.
* This class is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
class RenameService implements IRenameService {
@Inject extension EObjectAtOffsetHelper

3
org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/rename/RenameService2.xtend
View file

@ -180,8 +180,9 @@ class RenameService2 implements IRenameService2 {
/**
* @deprecated please override/call {@link #doPrepareRename(Resource, Document, PrepareRenameParams, CancelIndicator)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
@Deprecated//(forRemoval=true)
protected def Either<Range, PrepareRenameResult> doPrepareRename(Resource resource, Document document,
TextDocumentPositionParams params, CancelIndicator cancelIndicator) {
if (params instanceof PrepareRenameParams) {

2
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/UriExtensions.java
View file

@ -36,6 +36,7 @@ public class UriExtensions extends org.eclipse.xtext.util.UriExtensions {
/**
* @deprecated use #toUriString(URI)
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
public String toPath(final URI uri) {
@ -44,6 +45,7 @@ public class UriExtensions extends org.eclipse.xtext.util.UriExtensions {
/**
* @deprecated use toUriString(URI)
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
public String toPath(final java.net.URI uri) {

1
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/codeActions/ICodeActionService.java
View file

@ -20,6 +20,7 @@ import org.eclipse.xtext.util.CancelIndicator;
/**
* @author Sven Efftinge - Initial contribution and API
* @deprecated use {@link ICodeActionService2} instead
* This interface is scheduled to be removed with 2.22.
*/
@Deprecated
@SuppressWarnings("all")

1
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/formatting/FormattingService.java
View file

@ -123,6 +123,7 @@ public class FormattingService {
/**
* @deprecated use {@link #format(XtextResource, Document, int, int, FormattingOptions)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
public List<TextEdit> format(final XtextResource resource, final Document document, final int offset, final int length) {

1
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/ChangeConverter.java
View file

@ -39,6 +39,7 @@ import org.eclipse.xtext.xbase.lib.ListExtensions;
* @author koehnlein - Initial contribution and API
* @since 2.13
* @deprecated use {@link ChangeConverter2} instead
* This class is scheduled to be removed with 2.22.
*/
@Deprecated
@SuppressWarnings("all")

1
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/RenameService.java
View file

@ -43,6 +43,7 @@ import org.eclipse.xtext.xbase.lib.Functions.Function2;
* @author koehnlein - Initial contribution and API
* @since 2.13
* @deprecated use {@link RenameService2} instead.
* This class is scheduled to be removed with 2.22.
*/
@Deprecated
@SuppressWarnings("all")

1
org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/rename/RenameService2.java
View file

@ -251,6 +251,7 @@ public class RenameService2 implements IRenameService2 {
/**
* @deprecated please override/call {@link #doPrepareRename(Resource, Document, PrepareRenameParams, CancelIndicator)} instead.
* This method is scheduled to be removed with 2.22.
*/
@Deprecated
protected Either<Range, PrepareRenameResult> doPrepareRename(final Resource resource, final Document document, final TextDocumentPositionParams params, final CancelIndicator cancelIndicator) {

10
org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/AbstractLanguageServerTest.xtend
View file

@ -370,7 +370,10 @@ abstract class AbstractLanguageServerTest implements Endpoint {
return sb.toString;
}
@Deprecated
/**
* @deprecated This method is scheduled to be removed with 2.22.
*/
@Deprecated//(forRemoval=true)
protected dispatch def String toExpectation(org.eclipse.lsp4j.ColoringInformation it) {
return '''«range.toExpectation» -> [«styles.join(', ')»]''';
}
@ -715,7 +718,10 @@ abstract class AbstractLanguageServerTest implements Endpoint {
].get
}
@Deprecated
/**
* @deprecated This method is scheduled to be removed with 2.22.
*/
@Deprecated//(forRemoval=true)
protected def getColoringParams() {
languageServer.requestManager.runRead[
return notifications.map[value].filter(org.eclipse.lsp4j.ColoringParams).toMap([uri], [infos]);

6
org.eclipse.xtext.testing/xtend-gen/org/eclipse/xtext/testing/AbstractLanguageServerTest.java
View file

@ -795,6 +795,9 @@ public abstract class AbstractLanguageServerTest implements Endpoint {
return sb.toString();
}
/**
* @deprecated This method is scheduled to be removed with 2.22.
*/
@Deprecated
protected String _toExpectation(final ColoringInformation it) {
StringConcatenation _builder = new StringConcatenation();
@ -1426,6 +1429,9 @@ public abstract class AbstractLanguageServerTest implements Endpoint {
}
}
/**
* @deprecated This method is scheduled to be removed with 2.22.
*/
@Deprecated
protected Map<String, List<? extends ColoringInformation>> getColoringParams() {
try {