Renamed GlobalScope to Globals, to avoid name conflicts with Xtext's own elements.
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java index 2afcb2d..56e47d8 100644 --- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java +++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/contentassist/ProtobufProposalProvider.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList; import com.google.eclipse.protobuf.protobuf.*; import com.google.eclipse.protobuf.protobuf.Enum; -import com.google.eclipse.protobuf.scoping.GlobalScope; +import com.google.eclipse.protobuf.scoping.Globals; import com.google.eclipse.protobuf.ui.grammar.CompoundElements; import com.google.eclipse.protobuf.ui.grammar.Keywords; import com.google.eclipse.protobuf.ui.labeling.Images; @@ -40,7 +40,7 @@ @Inject private CompoundElements compoundElements; @Inject private EObjectFinder finder; - @Inject private GlobalScope globalScope; + @Inject private Globals globalScope; @Inject private PluginImageHelper imageHelper; @Inject private Images imageRegistry; @Inject private Keywords keywords;