Google Git
Sign in
eclipse/statet/org.eclipse.statet-r/0ebb1eebef0ac1bd8f10973dc5fcbda5e1dda451^!/.
commit
0ebb1eebef0ac1bd8f10973dc5fcbda5e1dda451
[log]
author
Stephan Wahlbrink <sw@wahlbrink.eu>
Wed Nov 17 23:54:09 2021 +0100
committer
Stephan Wahlbrink <sw@wahlbrink.eu>
Thu Nov 18 14:57:26 2021 +0100
tree
b5a66b7255749d76f4565a3b297606f04b83abe6
parent
f779f313b78f80ba09b696d8f16d45e0a96517d3 [diff]
Bug 574900: [R-Source] Adapt to changed StatusDetail

Change-Id: Ic91f67776a9a0da65d4254be1f57ea62a9765bde

diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RAstTests.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RAstTests.java
index d377205..c31fa44 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RAstTests.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/rsource/ast/RAstTests.java

@@ -21,7 +21,7 @@
 import org.eclipse.statet.jcommons.lang.Nullable;
 import org.eclipse.statet.jcommons.text.core.TextRegion;
 
-import org.eclipse.statet.ltk.ast.core.StatusDetail;
+import org.eclipse.statet.ltk.core.source.StatusDetail;
 import org.eclipse.statet.r.core.rsource.RTerminal;
 
 

diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/SyntaxProblemReporter.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/SyntaxProblemReporter.java
index 12b9f3d..98bc6cb 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/SyntaxProblemReporter.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/internal/r/core/rmodel/SyntaxProblemReporter.java

@@ -85,8 +85,8 @@
 import org.eclipse.statet.ecommons.runtime.core.util.MessageBuilder;
 
 import org.eclipse.statet.internal.r.core.RCorePlugin;
-import org.eclipse.statet.ltk.ast.core.StatusDetail;
 import org.eclipse.statet.ltk.core.source.SourceContent;
+import org.eclipse.statet.ltk.core.source.StatusDetail;
 import org.eclipse.statet.ltk.core.util.SourceMessageUtil;
 import org.eclipse.statet.ltk.issues.core.IssueRequestor;
 import org.eclipse.statet.ltk.issues.core.Problem;

diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java
index b953d7d..3845ee8 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/RLexer.java

@@ -35,7 +35,7 @@
 import org.eclipse.statet.jcommons.text.core.input.TextParserInput;
 import org.eclipse.statet.jcommons.util.StringUtils;
 
-import org.eclipse.statet.ltk.ast.core.StatusDetail;
+import org.eclipse.statet.ltk.core.source.StatusDetail;
 
 
 @NonNullByDefault
@@ -80,7 +80,7 @@
 	private static StatusDetail createDetail(final TextParserInput in,
 			final int startOffset, final int endOffset, final @Nullable String text) {
 		final int beginIndex= in.getIndex(startOffset);
-		return new StatusDetail(beginIndex, in.getIndex() + in.getLengthInSource(endOffset) - beginIndex,
+		return new StatusDetail(beginIndex, in.getIndex() + in.getLengthInSource(endOffset),
 				text );
 	}
 	

diff --git a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/RParser.java b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/RParser.java
index a3290e6..2beb022 100644
--- a/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/RParser.java
+++ b/r/org.eclipse.statet.r.core/src/org/eclipse/statet/r/core/rsource/ast/RParser.java

@@ -63,7 +63,7 @@
 import org.eclipse.statet.internal.r.core.RCorePlugin;
 import org.eclipse.statet.ltk.ast.core.AstInfo;
 import org.eclipse.statet.ltk.ast.core.AstNode;
-import org.eclipse.statet.ltk.ast.core.StatusDetail;
+import org.eclipse.statet.ltk.core.source.StatusDetail;
 import org.eclipse.statet.r.core.rsource.RLexer;
 import org.eclipse.statet.r.core.rsource.RSourceConfig;
 import org.eclipse.statet.r.core.rsource.RSourceConstants;

diff --git a/redocs/org.eclipse.statet.redocs.r/META-INF/MANIFEST.MF b/redocs/org.eclipse.statet.redocs.r/META-INF/MANIFEST.MF
index 43fd42e..c1d40c8 100644
--- a/redocs/org.eclipse.statet.redocs.r/META-INF/MANIFEST.MF
+++ b/redocs/org.eclipse.statet.redocs.r/META-INF/MANIFEST.MF

@@ -30,6 +30,7 @@
  org.eclipse.statet.ecommons.variables.core,
  org.eclipse.statet.jcommons.collections;version="4.5.0",
  org.eclipse.statet.jcommons.lang;version="4.5.0",
+ org.eclipse.statet.jcommons.model.core;version="4.5.0",
  org.eclipse.statet.jcommons.status;version="4.5.0",
  org.eclipse.statet.jcommons.string;version="4.5.0",
  org.eclipse.statet.jcommons.text.core;version="4.5.0",