Fixed: [ Issue 22 ] Add support for "syntax" element https://code.google.com/p/protobuf-dt/issues/detail?id=22 Fixed: [ Issue 23 ] Add support for optional semicolon for message elements https://code.google.com/p/protobuf-dt/issues/detail?id=23 In progress: [ Issue 24 ] Fix qualified names https://code.google.com/p/protobuf-dt/issues/detail?id=24
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext index 30c0022..c359ff3 100644 --- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext +++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
@@ -15,10 +15,14 @@ generate protobuf "http://www.google.com/eclipse/protobuf/Protobuf" Protobuf: + (syntax=Syntax)? (package=Package)? (imports+=Import)* (options+=Option)* (elements+=ProtobufElement)*; + +Syntax: + 'syntax' '=' name=STRING ';'; Package: 'package' name=QualifiedName ';'; @@ -42,7 +46,7 @@ 'message' name=ID '{' elements+=MessageElement* ('extensions' extensionsFrom=INT 'to' (extensionsTo=INT | 'max') ';')? - '}'; + '}'(';')?; MessageElement: Type | Property;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java index b88f850..1db98a5 100644 --- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java +++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java
@@ -8,9 +8,13 @@ */ package com.google.eclipse.protobuf; -import org.eclipse.xtext.scoping.impl.*; +import org.eclipse.xtext.naming.IQualifiedNameProvider; +import org.eclipse.xtext.scoping.impl.ImportUriResolver; +import org.eclipse.xtext.scoping.impl.LoadOnDemandResourceDescriptions; -import com.google.eclipse.protobuf.scoping.*; +import com.google.eclipse.protobuf.naming.ProtobufQualifiedNameProvider; +import com.google.eclipse.protobuf.scoping.ResourceDescriptions; +import com.google.eclipse.protobuf.scoping.SimpleImportUriResolver; import com.google.inject.Binder; /** @@ -19,9 +23,9 @@ public class ProtobufRuntimeModule extends com.google.eclipse.protobuf.AbstractProtobufRuntimeModule { /** {@inheritDoc} */ -// @Override public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() { -// return ProtobufQualifiedNameProvider.class; -// } + @Override public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() { + return ProtobufQualifiedNameProvider.class; + } public void configureImportUriResolver(Binder binder) { binder.bind(ImportUriResolver.class).to(SimpleImportUriResolver.class);