Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@
*/
package de.fraunhofer.ipa.ros.ide

import org.eclipse.xtext.resource.ILocationInFileProvider
import de.fraunhofer.ipa.ros.SafeLocationInFileProvider

/**
* Use this class to register ide components.
*/
class RosIdeModule extends AbstractRosIdeModule {
class RosIdeModule extends AbstractRosIdeModule {

def Class<? extends ILocationInFileProvider> bindILocationInFileProvider() {
SafeLocationInFileProvider;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ Workflow {
runtimeTest = {
enabled = true
}
runtime = {
enabled = true
}
genericIde = {
enabled = true
}
eclipsePlugin = {
enabled = true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package de.fraunhofer.ipa.ros

import org.eclipse.emf.ecore.EObject
import org.eclipse.xtext.resource.DefaultLocationInFileProvider
import org.eclipse.xtext.util.TextRegion

class SafeLocationInFileProvider extends DefaultLocationInFileProvider {

override getSignificantTextRegion(EObject obj) {
val significant = super.getSignificantTextRegion(obj)
val full = super.getFullTextRegion(obj)

if (significant !== null && full !== null) {
val start = Math.max(significant.getOffset(), full.getOffset())
val end = Math.min(
significant.getOffset() + significant.getLength(),
full.getOffset() + full.getLength()
)

val length = end - start

if (length < 0) {
return full
}

return new TextRegion(start, length)
}

return significant
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
*/
package de.fraunhofer.ipa.ros1.ide

import org.eclipse.xtext.resource.ILocationInFileProvider
import de.fraunhofer.ipa.ros.SafeLocationInFileProvider

/**
* Use this class to register ide components.
*/
class Ros1IdeModule extends AbstractRos1IdeModule {
def Class<? extends ILocationInFileProvider> bindILocationInFileProvider() {
SafeLocationInFileProvider;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Workflow {
runtimeTest = {
enabled = false
}
runtime = {
enabled = true
}
genericIde = {
enabled = true
}
eclipsePlugin = {
enabled = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
*/
package de.fraunhofer.ipa.ros2.ide

import org.eclipse.xtext.resource.ILocationInFileProvider
import de.fraunhofer.ipa.ros.SafeLocationInFileProvider

/**
* Use this class to register ide components.
*/
class Ros2IdeModule extends AbstractRos2IdeModule {
def Class<? extends ILocationInFileProvider> bindILocationInFileProvider() {
SafeLocationInFileProvider;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Workflow {
runtimeTest = {
enabled = false
}
runtime = {
enabled = true
}
genericIde = {
enabled = true
}
eclipsePlugin = {
enabled = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
*/
package de.fraunhofer.ipa.rossystem.ide

import org.eclipse.xtext.resource.ILocationInFileProvider
import de.fraunhofer.ipa.ros.SafeLocationInFileProvider

/**
* Use this class to register ide components.
*/
class RosSystemIdeModule extends AbstractRosSystemIdeModule {
def Class<? extends ILocationInFileProvider> bindILocationInFileProvider() {
SafeLocationInFileProvider;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Workflow {
runtimeTest = {
enabled = false
}
runtime = {
enabled = true
}
genericIde = {
enabled = true
}
eclipsePlugin = {
enabled = true
}
Expand Down