Revert "[b/11986390] Add support for Stubby4 streaming" This reverts commit b18835ff76100a372b474ce3fcc831e871bbb829.
diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF index 5f101b2..7f042ad 100644 --- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF +++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 1.5.9.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: com.google.eclipse.protobuf.ui.internal.ProtobufActivator Bundle-SymbolicName: com.google.eclipse.protobuf.ui; singleton:=true Bundle-ActivationPolicy: lazy
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF index 4f51d87..c87bed9 100644 --- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF +++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 1.5.9.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.antlr.runtime,
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 11c3461..dddd42f 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
@@ -143,8 +143,7 @@ Option | Rpc | Stream; Rpc: - 'rpc' name=Name '(' (=> argStream?='stream')? argType=MessageLink ')' - 'returns' '(' (=> returnStream?='stream')? returnType=MessageLink ')' + 'rpc' name=Name '(' argType=MessageLink ')' 'returns' '(' returnType=MessageLink ')' (('{' options+=Option* '}') (';')? | (';')+); Stream: @@ -294,8 +293,8 @@ SL_STRING (SL_STRING)*; terminal SL_STRING: - '"' ( '\\' . | !('\\'|'"') )* '"' (WS)* | - "'" ( '\\' . | !('\\'|"'") )* "'" (WS)*; + '"' ('\\' ('"' | "'" | '\\' | !('\\' | '"')) | !('\\' | '"'))* '"' (WS)* | + "'" ('\\' ('"' | "'" | '\\' | !('\\' | "'")) | !('\\' | "'"))* "'" (WS)*; terminal ID: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; terminal ML_COMMENT: '/*' -> '*/';