Skip to content
Browse files

Merge changes I0afa2cfd,Ic98797e7

* changes:
  [xbase][operators] Enabled inlining of == and !=
  [xbase][operators] Introduced !== operator
  • Loading branch information...
2 parents 2885145 + 2b3dec6 commit bb998d9a68263981fa625b7a4bb8579339df6cef @szarnekow szarnekow committed with Gerrit Code Review @ Eclipse.org Mar 12, 2013
Showing with 65,251 additions and 63,931 deletions.
  1. +3 −3 ...arithmetics/xtend-gen/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java
  2. +2 −2 ....arithmetics/xtend-gen/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsValidator.java
  3. +2 −2 ....domainmodel.tests/xtend-gen/org/eclipse/xtext/example/domainmodel/tests/OrganizeImportsTest.java
  4. +74 −1 .../org.eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.domainmodel.ui/plugin.xml
  5. +74 −1 ....eclipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen
  6. +5 −0 ....domainmodel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/AbstractDomainmodelUiModule.java
  7. +8 −0 ...c-gen/org/eclipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodel.g
  8. +68 −66 .../org/eclipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodel.tokens
  9. +442 −408 ...g/eclipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodelLexer.java
  10. +8,144 −8,098 .../eclipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodelParser.java
  11. +14 −4 ...e.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/AbstractDomainmodelRuntimeModule.java
  12. +2 −1 ...ipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Domainmodel.genmodel
  13. +1 −0 ...g.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Domainmodel.xmi
  14. +7 −0 ...inmodel/src-gen/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodel.g
  15. +58 −56 ...el/src-gen/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodel.tokens
  16. +394 −362 ...src-gen/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodelLexer.java
  17. +2,869 −2,829 ...rc-gen/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodelParser.java
  18. +1 −1 ....domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/services/DomainmodelGrammarAccess.java
  19. +2 −1 ...inmodel/xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java
  20. +1 −0 plugins/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/Xtend.xmi
  21. +2 −1 .../org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/DebugInternalXtend.g
  22. +7 −0 plugins/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtend.g
  23. +47 −45 .../org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtend.tokens
  24. +726 −693 ...g.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendLexer.java
  25. +3,002 −2,961 ....eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendParser.java
  26. +1 −1 plugins/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/services/XtendGrammarAccess.java
  27. +1 −1 plugins/org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
  28. +7 −7 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/RichStringFormatter.java
  29. +2 −2 ...ins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/RichStringToLineModel.java
  30. +11 −11 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/XtendFormatter.java
  31. +4 −4 ...rg.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ActiveAnnotationContextProvider.java
  32. +2 −2 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/CompilationContextImpl.java
  33. +2 −2 ...clipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ProcessorInstanceForJvmTypeProvider.java
  34. +5 −5 ...ins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/RegisterGlobalsContextImpl.java
  35. +3 −3 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
  36. +5 −5 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/XAnnotationExtensions.java
  37. +3 −3 ...rg.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/CompilationUnitImpl.java
  38. +11 −11 ...pse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmAnnotationReferenceImpl.java
  39. +2 −2 ...clipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmAnnotationTargetImpl.java
  40. +4 −4 ...clipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmClassDeclarationImpl.java
  41. +2 −2 ...e.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmExecutableDeclarationImpl.java
  42. +3 −3 ...rg.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmNamedElementImpl.java
  43. +6 −6 ...eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmTypeDeclarationImpl.java
  44. +4 −4 ...tend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/JvmTypeParameterDeclarationImpl.java
  45. +1 −2 .../org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/PrimitiveTypeImpl.java
  46. +2 −3 ...org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/ProblemSupportImpl.java
  47. +4 −3 ...ins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/TypeLookupImpl.java
  48. +2 −2 ...e.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/TypeParameterDeclarationImpl.java
  49. +3 −3 .../org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/TypeReferenceImpl.java
  50. +3 −4 ...ipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/TypeReferenceProviderImpl.java
  51. +2 −2 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/VoidTypeImpl.java
  52. +5 −5 ...e.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/XtendAnnotationReferenceImpl.java
  53. +2 −2 ...ipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/XtendAnnotationTargetImpl.java
  54. +2 −2 ...pse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/XtendMethodDeclarationImpl.java
  55. +7 −7 ...lipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/XtendTypeDeclarationImpl.java
  56. +2 −2 ...nd.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/XtendTypeParameterDeclarationImpl.java
  57. +4 −4 plugins/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/validation/AnnotationValidation.java
  58. +8 −0 .../org.eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/contentassist/antlr/internal/InternalXtend.g
  59. +68 −66 ...eclipse.xtend.ide/src-gen/org/eclipse/xtend/ide/contentassist/antlr/internal/InternalXtend.tokens
  60. +705 −673 ...ipse.xtend.ide/src-gen/org/eclipse/xtend/ide/contentassist/antlr/internal/InternalXtendLexer.java
  61. +12,855 −12,808 ...pse.xtend.ide/src-gen/org/eclipse/xtend/ide/contentassist/antlr/internal/InternalXtendParser.java
  62. +6 −7 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/AbstractCodeBuilder.java
  63. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/CodeBuilderFactory.java
  64. +6 −6 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/InsertionOffsets.java
  65. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/JavaAnnotationBuilder.java
  66. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/JavaClassBuilder.java
  67. +3 −3 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/JavaFieldBuilder.java
  68. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/JavaInterfaceBuilder.java
  69. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/JavaMethodBuilder.java
  70. +3 −3 ...ins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/XtendAnnotationBuilder.java
  71. +3 −3 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/XtendClassBuilder.java
  72. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/XtendFieldBuilder.java
  73. +3 −3 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/XtendInterfaceBuilder.java
  74. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codebuilder/XtendMethodBuilder.java
  75. +2 −2 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/hyperlinking/XtendFileHyperlink.java
  76. +2 −3 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/macro/JdtBasedProcessorProvider.java
  77. +1 −1 plugins/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/quickfix/CodeBuilderQuickfix.java
  78. +10 −10 ...e.xtext.generator/xtend-gen/org/eclipse/xtext/generator/serializer/AbstractSemanticSequencer.java
  79. +2 −2 ....xtext.generator/xtend-gen/org/eclipse/xtext/generator/serializer/AbstractSyntacticSequencer.java
  80. +2 −2 ....eclipse.xtext.generator/xtend-gen/org/eclipse/xtext/generator/serializer/GrammarConstraints.java
  81. +2 −2 ...org.eclipse.xtext.generator/xtend-gen/org/eclipse/xtext/generator/validation/ValidatorNaming.java
  82. +2 −2 ...xtext.generator/xtend-gen/org/eclipse/xtext/ui/generator/contentAssist/ContentAssistFragment.java
  83. +1 −1 plugins/org.eclipse.xtext.purexbase.ui/.classpath
  84. +5 −0 plugins/org.eclipse.xtext.purexbase.ui/.settings/org.eclipse.jdt.core.prefs
  85. +2 −1 plugins/org.eclipse.xtext.purexbase.ui/build.properties
  86. +116 −23 plugins/org.eclipse.xtext.purexbase.ui/plugin.xml
  87. +74 −1 plugins/org.eclipse.xtext.purexbase.ui/plugin.xml_gen
  88. +5 −0 ....eclipse.xtext.purexbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/AbstractPureXbaseUiModule.java
  89. +8 −0 ...exbase.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/antlr/internal/InternalPureXbase.g
  90. +65 −63 ...e.ui/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/antlr/internal/InternalPureXbase.tokens
  91. +413 −380 ...i/src-gen/org/eclipse/xtext/purexbase/ui/contentassist/antlr/internal/InternalPureXbaseLexer.java
  92. +7,621 −7,575 .../src-gen/org/eclipse/xtext/purexbase/ui/contentassist/antlr/internal/InternalPureXbaseParser.java
  93. +5 −0 plugins/org.eclipse.xtext.purexbase/.settings/org.eclipse.jdt.core.prefs
  94. +10 −0 ...g.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/AbstractPureXbaseRuntimeModule.java
  95. +4 −3 plugins/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbase.ecore
  96. +6 −4 plugins/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbase.genmodel
  97. +1 −0 plugins/org.eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/PureXbase.xmi
  98. +7 −0 ...pse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.g
  99. +64 −62 ...text.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbase.tokens
  100. +418 −387 ...t.purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseLexer.java
  101. +2,838 −2,798 ....purexbase/src-gen/org/eclipse/xtext/purexbase/parser/antlr/internal/InternalPureXbaseParser.java
  102. +1 −1 ....eclipse.xtext.purexbase/src-gen/org/eclipse/xtext/purexbase/services/PureXbaseGrammarAccess.java
  103. +1 −0 plugins/org.eclipse.xtext.purexbase/src/org/eclipse/xtext/purexbase/GeneratePureXbase.mwe2
  104. +5 −6 ...clipse.xtext.xbase.junit/src/org/eclipse/xtext/xbase/junit/ui/AbstractXbaseContentAssistTest.java
  105. +7 −7 plugins/org.eclipse.xtext.xbase.junit/xtend-gen/org/eclipse/xtext/xbase/junit/typesystem/Oven.java
  106. +21 −6 plugins/org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/ObjectExtensions.java
  107. +5 −0 ...xbase.ui/src-gen/org/eclipse/xtext/xbase/annotations/ui/AbstractXbaseWithAnnotationsUiModule.java
  108. +8 −0 ...rg/eclipse/xtext/xbase/annotations/ui/contentassist/antlr/internal/InternalXbaseWithAnnotations.g
  109. +65 −63 ...lipse/xtext/xbase/annotations/ui/contentassist/antlr/internal/InternalXbaseWithAnnotations.tokens
  110. +404 −373 ...se/xtext/xbase/annotations/ui/contentassist/antlr/internal/InternalXbaseWithAnnotationsLexer.java
  111. +8,012 −7,966 ...e/xtext/xbase/annotations/ui/contentassist/antlr/internal/InternalXbaseWithAnnotationsParser.java
  112. +5 −0 plugins/org.eclipse.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/AbstractXbaseUiModule.java
  113. +8 −0 ...se.xtext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/antlr/internal/InternalXbase.g
  114. +64 −62 ...ext.xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/antlr/internal/InternalXbase.tokens
  115. +426 −395 ....xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/antlr/internal/InternalXbaseLexer.java
  116. +7,560 −7,514 ...xbase.ui/src-gen/org/eclipse/xtext/xbase/ui/contentassist/antlr/internal/InternalXbaseParser.java
  117. +6 −6 ...clipse.xtext.xbase.ui/xtend-gen/org/eclipse/xtext/xbase/ui/editor/XbaseEditorInputRedirector.java
  118. +1 −0 plugins/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/Xbase.xmi
  119. +2 −2 ....xbase/src-gen/org/eclipse/xtext/xbase/annotations/AbstractXbaseWithAnnotationsRuntimeModule.java
  120. +1 −0 plugins/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/annotations/XbaseWithAnnotations.xmi
  121. +2 −1 ...gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/DebugInternalXbaseWithAnnotations.g
  122. +7 −0 .../src-gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.g
  123. +60 −58 ...gen/org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotations.tokens
  124. +389 −357 .../org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsLexer.java
  125. +2,862 −2,822 ...org/eclipse/xtext/xbase/annotations/parser/antlr/internal/InternalXbaseWithAnnotationsParser.java
  126. +1 −1 ...xbase/src-gen/org/eclipse/xtext/xbase/annotations/services/XbaseWithAnnotationsGrammarAccess.java
  127. +2 −1 ...rg.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/DebugInternalXbase.g
  128. +7 −0 ...ins/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.g
  129. +64 −62 ...rg.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbase.tokens
  130. +427 −396 ...eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseLexer.java
  131. +2,876 −2,836 ...clipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/parser/antlr/internal/InternalXbaseParser.java
  132. +7 −3 plugins/org.eclipse.xtext.xbase/src-gen/org/eclipse/xtext/xbase/services/XbaseGrammarAccess.java
  133. +3 −1 plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/GenerateXbase.mwe2
  134. +1 −1 plugins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/Xbase.xtext
  135. +72 −0 ...ins/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/scoping/featurecalls/OperatorMapping.java
  136. +7 −7 ...ase/xtend-gen/org/eclipse/xtext/xbase/annotations/interpreter/ConstantExpressionsInterpreter.java
  137. +2 −2 ...ins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/BrokenTypeRefDetector.java
  138. +5 −5 ....eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/DisableCodeGenerationAdapter.java
  139. +9 −8 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/ErrorSafeExtensions.java
  140. +24 −25 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/JvmModelGenerator.java
  141. +3 −3 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/compiler/TreeAppendableUtil.java
  142. +2 −2 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/AbstractFormatter.java
  143. +10 −10 ...ins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattableDocument.java
  144. +3 −3 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingData.java
  145. +8 −7 ...s/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataFactory.java
  146. +1 −1 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/FormattingDataInit.java
  147. +7 −7 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/HiddenLeafAccess.java
  148. +1 −1 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/HiddenLeafs.java
  149. +9 −9 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/NodeModelAccess.java
  150. +2 −2 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/WhitespaceData.java
  151. +63 −62 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/formatting/XbaseFormatter2.java
  152. +2 −3 ...s/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/jvmmodel/JvmIdentifiableMetaData.java
  153. +4 −4 plugins/org.eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/jvmmodel/JvmTypeExtensions.java
  154. +2 −2 ...t.xbase/xtend-gen/org/eclipse/xtext/xbase/typesystem/references/LightweightBoundTypeArgument.java
  155. +2 −2 ...eclipse.xtext.xbase/xtend-gen/org/eclipse/xtext/xbase/typesystem/util/ConstraintVisitingInfo.java
  156. +9 −10 ...xtext.xtext.ui/xtend-gen/org/eclipse/xtext/xtext/ui/wizard/ecore2xtext/Ecore2XtextExtensions.java
  157. +5 −5 ...t.xtext.ui/xtend-gen/org/eclipse/xtext/xtext/ui/wizard/ecore2xtext/Ecore2XtextGrammarCreator.java
  158. +2 −2 ...org.eclipse.xtend.core.tests/longrunning/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_0.java
  159. +2 −2 ...org.eclipse.xtend.core.tests/longrunning/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_2.java
  160. +2 −2 ...org.eclipse.xtend.core.tests/longrunning/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_3.java
  161. +2 −2 ...org.eclipse.xtend.core.tests/longrunning/xtend-gen/org/eclipse/xtend/core/tests/smoke/Case_9.java
  162. +3 −3 ...nd-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenAnnotationCompilerSmokeTest.java
  163. +3 −3 ...ing/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenCompilerBugSmokeTest.java
  164. +3 −3 ...unning/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenCompilerSmokeTest.java
  165. +3 −3 ...nd-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenConfiguredCompilerSmokeTest.java
  166. +3 −3 ...ng/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenDataCompilerSmokeTest.java
  167. +3 −3 ...nd-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenExtensionsCompilerSmokeTest.java
  168. +3 −3 ...tend-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenPropertyCompilerSmokeTest.java
  169. +3 −3 ...g/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipNodesInBetweenXtendCompilerSmokeTest.java
  170. +3 −3 ...d-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenAnnotationCompilerSmokeTest.java
  171. +3 −3 ...ng/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenCompilerBugSmokeTest.java
  172. +3 −3 ...nning/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenCompilerSmokeTest.java
  173. +3 −3 ...d-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenConfiguredCompilerSmokeTest.java
  174. +3 −3 ...g/xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenDataCompilerSmokeTest.java
  175. +3 −3 ...d-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenExtensionsCompilerSmokeTest.java
  176. +3 −3 ...end-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenPropertyCompilerSmokeTest.java
  177. +3 −3 .../xtend-gen/org/eclipse/xtend/core/tests/typesystem/SkipTokensInBetweenXtendCompilerSmokeTest.java
  178. +12 −12 tests/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.xtend
  179. +3 −3 ...g.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.java
  180. +14 −14 ...g.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.java
  181. +2 −2 ...eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/debug/LineNumberMappingTests.java
  182. +2 −2 ...tend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/formatting/AbstractXtendFormatterTest.java
  183. +2 −2 ....eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/imports/ImportOrganizerTest.java
  184. +2 −2 ...re.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/AbstractReuasableActiveAnnotationTests.java
  185. +2 −2 ....eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/DelegatingClassloader.java
  186. +2 −2 tests/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/GetProcessor.java
  187. +5 −4 ...org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/ImmutableProcessor.java
  188. +3 −2 ...xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/AbstractAssignabilityTest.java
  189. +4 −4 ...core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/ActualTypeArgumentCollectorTest.java
  190. +3 −3 ...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/ActualTypeArgumentMergeTest.java
  191. +2 −1 ...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/BoundTypeArgumentMergerTest.java
  192. +3 −2 ...lipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/CommonSuperTypeTest.java
  193. +3 −3 ...sts/xtend-gen/org/eclipse/xtend/core/tests/typesystem/DeferredTypeParameterHintCollectorTest.java
  194. +2 −2 ...nd.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/MockTypeParameterSubstitutor.java
  195. +3 −3 ...e.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/typesystem/OldAPIAssignabilityTest.java
  196. +3 −3 ...clipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/codebuilder/AbstractBuilderTest.java
  197. +3 −3 ....xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/compiler/RebuildAffectedResourcesTest.java
  198. +3 −3 ...se.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/editor/XbaseEditorOpenClassFileTest.java
  199. +30 −29 ...eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/findrefs/JdtFindReferencesTest.java
  200. +6 −5 ...g.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/quickfix/QuickfixTestBuilder.java
  201. +3 −2 ...ipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/validation/XtendUIValidationTests.java
  202. +4 −4 ...base.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/annotations/AbstractSmokeTest.java
  203. +2 −2 ...ase.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/annotations/SkipNodesInBetween.java
  204. +3 −3 ...se.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/annotations/SkipTokensInBetween.java
  205. +2 −2 ...ongrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/AbstractOldAPITypeArgumentTest.java
  206. +2 −2 ...ongrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/AbstractOldAPITypeResolverTest.java
  207. +6 −6 ...base.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/FeatureCallRequest.java
  208. +3 −3 ...base.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/SkipNodesInBetween.java
  209. +3 −3 ...ase.tests/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/SkipTokensInBetween.java
  210. +6 −6 ...ng/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/ValidatingExpressionAwareResolvedTypes.java
  211. +6 −6 ...unning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/ValidatingReassigningResolvedTypes.java
  212. +7 −7 ...s/longrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/ValidatingRootResolvedTypes.java
  213. +5 −5 ...ongrunning/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/ValidatingStackedResolvedTypes.java
  214. +3 −3 ...pse.xtext.xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/compiler/JvmModelGeneratorTest.java
  215. +4 −4 ...clipse.xtext.xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/compiler/LoopExtensionsTest.java
  216. +2 −2 ...xt.xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/formatting/AbstractXbaseFormatterTest.java
  217. +2 −1 ...se.xtext.xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/jvmmodel/JvmModelAssociaterTest.java
  218. +3 −3 ...g.eclipse.xtext.xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/linking/BatchLinkingTest.java
  219. +3 −3 ...tests/xtend-gen/org/eclipse/xtext/xbase/tests/resources/XbaseResourceDescriptionStrategyTest.java
  220. +4 −4 ...xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/AbstractBatchTypeResolverTest.java
  221. +4 −4 ....xbase.tests/xtend-gen/org/eclipse/xtext/xbase/tests/typesystem/AbstractIdentifiableTypeTest.java
  222. +3 −3 ...ui.tests/xtend-gen/org/eclipse/xtext/xbase/ui/tests/editor/AbstractXbaseContentAssistBugTest.java
  223. +3 −3 ...xbase.ui.tests/xtend-gen/org/eclipse/xtext/xbase/ui/tests/quickfix/AbstractXbaseQuickfixTest.java
  224. +2 −2 ...ext.xbase.ui.tests/xtend-gen/org/eclipse/xtext/xbase/ui/tests/refactoring/ExpressionUtilTest.java
  225. +2 −2 ...se.ui.tests/xtend-gen/org/eclipse/xtext/xbase/ui/tests/refactoring/TypeSerializationUtilTest.java
View
6 ...ics/xtend-gen/org/eclipse/xtext/example/arithmetics/scoping/ArithmeticsScopeProvider.java
@@ -3,6 +3,7 @@
*/
package org.eclipse.xtext.example.arithmetics.scoping;
+import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
@@ -11,7 +12,6 @@
import org.eclipse.xtext.scoping.IScope;
import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
import org.eclipse.xtext.scoping.impl.FilteringScope;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
/**
* This class contains custom scoping description.
@@ -32,12 +32,12 @@ public IScope getScope(final EObject context, final EReference reference) {
public boolean apply(final IEObjectDescription it) {
boolean _and = false;
boolean _and_1 = false;
- boolean _notEquals = ObjectExtensions.operator_notEquals(it, null);
+ boolean _notEquals = (!Objects.equal(it, null));
if (!_notEquals) {
_and_1 = false;
} else {
QualifiedName _name = it.getName();
- boolean _notEquals_1 = ObjectExtensions.operator_notEquals(_name, null);
+ boolean _notEquals_1 = (!Objects.equal(_name, null));
_and_1 = (_notEquals && _notEquals_1);
}
if (!_and_1) {
View
4 ...tics/xtend-gen/org/eclipse/xtext/example/arithmetics/validation/ArithmeticsValidator.java
@@ -3,6 +3,7 @@
*/
package org.eclipse.xtext.example.arithmetics.validation;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.math.BigDecimal;
import org.eclipse.emf.common.util.TreeIterator;
@@ -18,7 +19,6 @@
import org.eclipse.xtext.example.arithmetics.validation.AbstractArithmeticsValidator;
import org.eclipse.xtext.validation.Check;
import org.eclipse.xtext.validation.ValidationMessageAcceptor;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
/**
* Custom validation rules.
@@ -55,7 +55,7 @@ public void checkNormalizable(final Expression expr) {
return;
}
Evaluation _containerOfType = EcoreUtil2.<Evaluation>getContainerOfType(expr, Evaluation.class);
- boolean _notEquals = ObjectExtensions.operator_notEquals(_containerOfType, null);
+ boolean _notEquals = (!Objects.equal(_containerOfType, null));
if (_notEquals) {
return;
}
View
4 ...odel.tests/xtend-gen/org/eclipse/xtext/example/domainmodel/tests/OrganizeImportsTest.java
@@ -1,5 +1,6 @@
package org.eclipse.xtext.example.domainmodel.tests;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.List;
import org.eclipse.emf.ecore.resource.Resource;
@@ -17,7 +18,6 @@
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -56,7 +56,7 @@ public Integer apply(final ReplaceRegion it) {
for (final ReplaceRegion it : sortedChanges) {
{
boolean _and = false;
- boolean _notEquals = ObjectExtensions.operator_notEquals(lastChange, null);
+ boolean _notEquals = (!Objects.equal(lastChange, null));
if (!_notEquals) {
_and = false;
} else {
View
75 ...ipse.xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.domainmodel.ui/plugin.xml
@@ -34,7 +34,27 @@
definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.xtext.example.domainmodel.ui.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.xtext.example.domainmodel.ui.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened">
@@ -47,6 +67,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.xtext.example.domainmodel.Domainmodel"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -97,6 +127,19 @@
id="org.eclipse.xtext.example.domainmodel.Domainmodel.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -112,6 +155,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
View
75 ....xtext.xtext.ui.examples/contents/org.eclipse.xtext.example.domainmodel.ui/plugin.xml_gen
@@ -34,7 +34,27 @@
definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened">
</reference>
</activeWhen>
- </handler>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.eclipse.xtext.example.domainmodel.ui.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.xtext.example.domainmodel.ui.DomainmodelExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened">
@@ -47,6 +67,16 @@
</with>
</and>
</definition>
+ <definition id="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.eclipse.xtext.example.domainmodel.Domainmodel"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
@@ -97,6 +127,19 @@
id="org.eclipse.xtext.example.domainmodel.Domainmodel.validate"
name="Validate">
</command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution
@@ -112,6 +155,36 @@
</visibleWhen>
</command>
</menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.eclipse.xtext.example.domainmodel.Domainmodel.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
View
5 ...odel.ui/src-gen/org/eclipse/xtext/example/domainmodel/ui/AbstractDomainmodelUiModule.java
@@ -28,6 +28,11 @@ public AbstractDomainmodelUiModule(AbstractUIPlugin plugin) {
return org.eclipse.xtext.xbase.ui.editor.XbaseEditor.class;
}
+ // contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
+ public Class<? extends org.eclipse.xtext.ui.editor.model.XtextDocumentProvider> bindXtextDocumentProvider() {
+ return org.eclipse.xtext.xbase.ui.editor.XbaseDocumentProvider.class;
+ }
+
// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
View
8 ...g/eclipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodel.g
@@ -2393,6 +2393,14 @@ rule__OpEquality__Alternatives
{ after(grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2()); }
)
+ |(
+{ before(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); }
+
+ '!=='
+
+{ after(grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3()); }
+)
+
;
finally {
restoreStackSize(stackSize);
View
134 ...ipse/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodel.tokens
@@ -28,8 +28,8 @@ RULE_HEX=5
T__58=58
T__16=16
T__51=51
-T__52=52
T__15=15
+T__52=52
T__53=53
T__18=18
T__54=54
@@ -57,6 +57,7 @@ T__49=49
T__85=85
RULE_SL_COMMENT=10
T__84=84
+T__86=86
RULE_ML_COMMENT=9
T__30=30
T__31=31
@@ -80,76 +81,77 @@ T__73=73
T__79=79
T__78=78
T__77=77
-'instanceof'=56
-'>='=21
-'#'=58
-'/'=36
+'instanceof'=57
+'>='=22
+'#'=59
+'/'=37
'=='=18
-'switch'=64
-'>'=23
+'switch'=65
+'>'=24
'||'=14
-'*.'=82
-'extension'=44
+'*.'=83
+'extension'=45
'&&'=15
-';'=61
-'return'=75
+';'=62
+'return'=76
'==='=20
-'<>'=29
-'for'=67
-'?.'=81
-'+'=32
-'=>'=28
-'.'=39
-'import'=43
-'?:'=30
-'static'=42
-'true'=85
-'catch'=78
-'else'=63
-'op'=52
-'extends'=41
+'<>'=30
+'for'=68
+'?.'=82
+'+'=33
+'=>'=29
+'.'=40
+'import'=44
+'?:'=31
+'static'=43
+'true'=86
+'catch'=79
+'else'=64
+'op'=53
+'extends'=42
'+='=16
-'{'=48
-'package'=47
-'as'=57
-'?'=79
-'try'=76
-'var'=84
-'entity'=50
-'if'=62
-':'=51
-'('=53
-'while'=68
-'**'=35
-'-'=33
-','=55
-'default'=65
+'{'=49
+'package'=48
+'as'=58
+'?'=80
+'try'=77
+'var'=85
+'entity'=51
+'if'=63
+':'=52
+'('=54
+'while'=69
+'**'=36
+'-'=34
+','=56
+'default'=66
'-='=17
-']'=60
-'..'=27
-'!'=38
-'|'=83
-'finally'=77
-'..<'=26
-'new'=71
-'val'=40
-'null'=72
-'typeof'=73
-'<=>'=31
+']'=61
+'..'=28
+'!'=39
+'|'=84
+'finally'=78
+'..<'=27
+'new'=72
+'val'=41
+'null'=73
+'typeof'=74
+'<=>'=32
'='=13
-'throw'=74
-'::'=70
-')'=54
-'->'=25
-'%'=37
-'do'=69
-'super'=45
-'case'=66
-'}'=49
-'<='=22
+'throw'=75
+'::'=71
+')'=55
+'->'=26
+'%'=38
+'do'=70
+'super'=46
+'case'=67
+'}'=50
+'<='=23
'!='=19
-'false'=46
-'<'=24
-'*'=34
-'['=59
-'&'=80
+'!=='=21
+'false'=47
+'<'=25
+'*'=35
+'['=60
+'&'=81
View
850 ...e/xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodelLexer.java
442 additions, 408 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
16,242 .../xtext/example/domainmodel/ui/contentassist/antlr/internal/InternalDomainmodelParser.java
8,144 additions, 8,098 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
18 ...model/src-gen/org/eclipse/xtext/example/domainmodel/AbstractDomainmodelRuntimeModule.java
@@ -280,6 +280,11 @@ public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
}
// contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
+ public Class<? extends org.eclipse.xtext.validation.CancelableDiagnostician> bindCancelableDiagnostician() {
+ return org.eclipse.xtext.xbase.validation.XbaseDiagnostician.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
public Class<? extends org.eclipse.xtext.xbase.typesystem.computation.ITypeComputer> bindITypeComputer() {
return org.eclipse.xtext.xbase.annotations.typesystem.XbaseWithAnnotationsTypeComputer.class;
}
@@ -295,6 +300,11 @@ public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
}
// contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
+ public Class<? extends org.eclipse.xtext.linking.ILinkingDiagnosticMessageProvider> bindILinkingDiagnosticMessageProvider() {
+ return org.eclipse.xtext.xbase.annotations.validation.UnresolvedAnnotationTypeAwareMessageProducer.class;
+ }
+
+ // contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
public Class<? extends org.eclipse.xtext.resource.ILocationInFileProvider> bindILocationInFileProvider() {
return org.eclipse.xtext.xbase.jvmmodel.JvmLocationInFileProvider.class;
}
@@ -320,13 +330,13 @@ public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
}
// contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
- public Class<? extends org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer> bindIJvmModelInferrer() {
- return org.eclipse.xtext.example.domainmodel.jvmmodel.DomainmodelJvmModelInferrer.class;
+ public Class<? extends org.eclipse.xtext.validation.IResourceValidator> bindIResourceValidator() {
+ return org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator.class;
}
// contributed by org.eclipse.xtext.generator.xbase.XbaseGeneratorFragment
- public Class<? extends org.eclipse.xtext.validation.IResourceValidator> bindIResourceValidator() {
- return org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator.class;
+ public Class<? extends org.eclipse.xtext.xbase.jvmmodel.IJvmModelInferrer> bindIJvmModelInferrer() {
+ return org.eclipse.xtext.example.domainmodel.jvmmodel.DomainmodelJvmModelInferrer.class;
}
}
View
3 ...xt.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Domainmodel.genmodel
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+<genmodel:GenModel xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.xtext.example.domainmodel/src-gen"
editDirectory="/org.eclipse.xtext.example.domainmodel.edit/src" editorDirectory="/org.eclipse.xtext.example.domainmodel.editor/src"
modelPluginID="org.eclipse.xtext.example.domainmodel" forceOverwrite="true" modelName="Domainmodel"
View
1 ...e.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/domainmodel/Domainmodel.xmi
@@ -313,6 +313,7 @@
<elements xsi:type="xtext:Keyword" value="=="/>
<elements xsi:type="xtext:Keyword" value="!="/>
<elements xsi:type="xtext:Keyword" value="==="/>
+ <elements xsi:type="xtext:Keyword" value="!=="/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="XRelationalExpression">
View
7 ...src-gen/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodel.g
@@ -1075,6 +1075,13 @@ ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
$current.merge(kw);
newLeafNode(kw, grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2());
}
+
+ |
+ kw='!=='
+ {
+ $current.merge(kw);
+ newLeafNode(kw, grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3());
+ }
)
;
View
114 ...en/org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodel.tokens
@@ -28,8 +28,8 @@ RULE_HEX=5
T__58=58
T__16=16
T__51=51
-T__52=52
T__15=15
+T__52=52
T__53=53
T__18=18
T__54=54
@@ -57,6 +57,7 @@ T__49=49
T__85=85
RULE_SL_COMMENT=10
T__84=84
+T__86=86
RULE_ML_COMMENT=9
T__30=30
T__31=31
@@ -80,76 +81,77 @@ T__73=73
T__79=79
T__78=78
T__77=77
-'instanceof'=31
-'>='=32
-'#'=54
+'instanceof'=32
+'>='=33
+'#'=55
'=='=28
-'/'=47
-'switch'=61
-'>'=34
+'/'=48
+'switch'=62
+'>'=35
'||'=26
-'extension'=71
-'*.'=53
+'extension'=72
+'*.'=54
'&&'=27
-';'=58
-'return'=80
+';'=59
+'return'=81
'==='=30
-'<>'=40
-'for'=64
-'?.'=52
-'+'=43
-'=>'=39
-'.'=51
-'import'=70
-'?:'=41
-'static'=69
-'true'=76
-'catch'=83
+'<>'=41
+'for'=65
+'?.'=53
+'+'=44
+'=>'=40
+'.'=52
+'import'=71
+'?:'=42
+'static'=70
+'true'=77
+'catch'=84
'op'=19
-'else'=60
+'else'=61
'extends'=17
'+='=24
'{'=14
'package'=13
-'as'=50
-'?'=84
-'try'=81
-'var'=67
+'as'=51
+'?'=85
+'try'=82
+'var'=68
'entity'=16
-'if'=59
+'if'=60
':'=18
'('=20
-'while'=65
-'-'=44
-'**'=46
+'while'=66
+'-'=45
+'**'=47
','=21
-'default'=62
+'default'=63
'-='=25
-']'=56
-'..'=38
-'!'=49
-'finally'=82
-'..<'=37
-'|'=57
-'new'=74
-'val'=68
-'null'=77
-'typeof'=78
+']'=57
+'..'=39
+'!'=50
+'finally'=83
+'..<'=38
+'|'=58
+'new'=75
+'val'=69
+'null'=78
+'typeof'=79
'='=23
-'<=>'=42
-'throw'=79
-'::'=73
+'<=>'=43
+'throw'=80
+'::'=74
')'=22
-'->'=36
-'%'=48
-'super'=72
-'do'=66
-'case'=63
+'->'=37
+'%'=49
+'super'=73
+'do'=67
+'case'=64
'}'=15
-'<='=33
+'<='=34
+'!=='=31
'!='=29
-'false'=75
-'<'=35
-'*'=45
-'['=55
-'&'=85
+'false'=76
+'<'=36
+'*'=46
+'['=56
+'&'=86
View
756 ...org/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodelLexer.java
394 additions, 362 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
5,698 ...rg/eclipse/xtext/example/domainmodel/parser/antlr/internal/InternalDomainmodelParser.java
2,869 additions, 2,829 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 ...odel/src-gen/org/eclipse/xtext/example/domainmodel/services/DomainmodelGrammarAccess.java
@@ -516,7 +516,7 @@ public ParserRule getXEqualityExpressionRule() {
}
//OpEquality:
- // "==" | "!=" | "===";
+ // "==" | "!=" | "===" | "!==";
public XbaseGrammarAccess.OpEqualityElements getOpEqualityAccess() {
return gaXbase.getOpEqualityAccess();
}
View
3 ...xtend-gen/org/eclipse/xtext/example/domainmodel/jvmmodel/DomainmodelJvmModelInferrer.java
@@ -1,5 +1,6 @@
package org.eclipse.xtext.example.domainmodel.jvmmodel;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
@@ -49,7 +50,7 @@ public void apply(final JvmGenericType it) {
String _documentation = DomainmodelJvmModelInferrer.this._jvmTypesBuilder.getDocumentation(entity);
DomainmodelJvmModelInferrer.this._jvmTypesBuilder.setDocumentation(it, _documentation);
JvmParameterizedTypeReference _superType = entity.getSuperType();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_superType, null);
+ boolean _notEquals = (!Objects.equal(_superType, null));
if (_notEquals) {
EList<JvmTypeReference> _superTypes = it.getSuperTypes();
JvmParameterizedTypeReference _superType_1 = entity.getSuperType();
View
1 plugins/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/Xtend.xmi
@@ -1452,6 +1452,7 @@
<elements xsi:type="xtext:Keyword" value="=="/>
<elements xsi:type="xtext:Keyword" value="!="/>
<elements xsi:type="xtext:Keyword" value="==="/>
+ <elements xsi:type="xtext:Keyword" value="!=="/>
</alternatives>
</rules>
<rules xsi:type="xtext:ParserRule" name="XRelationalExpression">
View
3 ...ipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/DebugInternalXtend.g
@@ -425,7 +425,8 @@ ruleXEqualityExpression :
ruleOpEquality :
'==' |
'!=' |
- '==='
+ '===' |
+ '!=='
;
// Rule XRelationalExpression
View
7 ...g.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtend.g
@@ -4712,6 +4712,13 @@ ruleOpEquality returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
$current.merge(kw);
newLeafNode(kw, grammarAccess.getOpEqualityAccess().getEqualsSignEqualsSignEqualsSignKeyword_2());
}
+
+ |
+ kw='!=='
+ {
+ $current.merge(kw);
+ newLeafNode(kw, grammarAccess.getOpEqualityAccess().getExclamationMarkEqualsSignEqualsSignKeyword_3());
+ }
)
;
View
92 ...ipse.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtend.tokens
@@ -59,6 +59,7 @@ T__62=62
RULE_RICH_TEXT=6
T__63=63
T__116=116
+T__117=117
T__114=114
T__115=115
T__61=61
@@ -111,100 +112,101 @@ T__38=38
T__39=39
RULE_RICH_TEXT_INBETWEEN=8
RULE_WS=18
-'>='=73
+'>='=74
'=='=69
'AFTER'=57
'implements'=27
'extension'=34
';'=21
'==='=71
-'return'=111
+'return'=112
'create'=50
-'<>'=79
+'<>'=80
'protected'=41
-'for'=101
-'?.'=90
-'=>'=78
+'for'=102
+'?.'=91
+'=>'=79
'static'=43
-'catch'=114
+'catch'=115
'extends'=26
'{'=28
'def'=48
'package'=20
-'try'=112
+'try'=113
'var'=47
':'=51
'('=35
-'**'=84
+'**'=85
'annotation'=32
'public'=39
-'default'=99
-']'=94
+'default'=100
+']'=95
'enum'=31
-'..<'=76
-'finally'=113
+'..<'=77
+'finally'=114
'new'=38
'val'=46
'ENDFOR'=58
'throws'=37
'='=33
-'<=>'=81
-'->'=75
-'%'=86
-'super'=104
-'case'=100
+'<=>'=82
+'->'=76
+'%'=87
+'super'=105
+'case'=101
'override'=49
'ENDIF'=61
'ELSE'=60
-'<='=74
+'<='=75
'!='=70
+'!=='=72
'<'=23
-'['=93
-'&'=116
+'['=94
+'&'=117
'BEFORE'=55
-'instanceof'=72
-'#'=92
-'/'=85
-'switch'=98
+'instanceof'=73
+'#'=93
+'/'=86
+'switch'=99
'>'=25
'||'=67
-'*.'=91
+'*.'=92
'&&'=68
'+'=64
-'.'=89
+'.'=90
'import'=52
-'?:'=80
+'?:'=81
'FOR'=54
-'true'=107
-'else'=97
+'true'=108
+'else'=98
'final'=45
'+='=65
'...'=53
-'as'=88
-'?'=115
+'as'=89
+'?'=116
'private'=40
-'if'=96
-'-'=82
-'while'=102
+'if'=97
+'-'=83
+'while'=103
','=24
'-='=66
-'..'=77
-'!'=87
-'|'=95
+'..'=78
+'!'=88
+'|'=96
'class'=22
'SEPARATOR'=56
-'null'=108
-'typeof'=109
+'null'=109
+'typeof'=110
'dispatch'=44
'@'=63
-'::'=105
-'throw'=110
+'::'=106
+'throw'=111
')'=36
-'do'=103
+'do'=104
'}'=29
'abstract'=42
'IF'=59
-'false'=106
+'false'=107
'ELSEIF'=62
-'*'=83
+'*'=84
'interface'=30
View
1,419 ...e.xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendLexer.java
726 additions, 693 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
5,963 ....xtend.core/src-gen/org/eclipse/xtend/core/parser/antlr/internal/InternalXtendParser.java
3,002 additions, 2,961 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 ...ns/org.eclipse.xtend.core/src-gen/org/eclipse/xtend/core/services/XtendGrammarAccess.java
@@ -2916,7 +2916,7 @@ public ParserRule getXEqualityExpressionRule() {
}
//OpEquality:
- // "==" | "!=" | "===";
+ // "==" | "!=" | "===" | "!==";
public XbaseGrammarAccess.OpEqualityElements getOpEqualityAccess() {
return gaXbaseWithAnnotations.getOpEqualityAccess();
}
View
2 plugins/org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
@@ -18,8 +18,8 @@ var memoize = false
Workflow {
bean = StandaloneSetup {
+ ignoreBrokenProjectFiles = true
platformUri = "${projectPath}/../.."
- platformUri = "${projectPath}/../../../org.eclipse.xtext"
registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"
}
View
14 ...g.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/RichStringFormatter.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.formatting;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.Arrays;
import java.util.List;
@@ -37,7 +38,6 @@
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
import org.eclipse.xtext.xbase.lib.StringExtensions;
@@ -65,7 +65,7 @@
public void format(final Procedure2<? super EObject,? super FormattableDocument> formatter, final FormattableDocument doc, final RichString richString) {
EObject _eContainer = richString.eContainer();
RichString _containerOfType = EcoreUtil2.<RichString>getContainerOfType(_eContainer, RichString.class);
- boolean _notEquals = ObjectExtensions.operator_notEquals(_containerOfType, null);
+ boolean _notEquals = (!Objects.equal(_containerOfType, null));
if (_notEquals) {
return;
}
@@ -104,7 +104,7 @@ public void format(final Procedure2<? super EObject,? super FormattableDocument>
_and_1 = false;
} else {
Line _head = IterableExtensions.<Line>head(lines);
- boolean _equals = ObjectExtensions.operator_equals(line, _head);
+ boolean _equals = Objects.equal(line, _head);
_and_1 = (canIndent && _equals);
}
if (_and_1) {
@@ -119,7 +119,7 @@ public void format(final Procedure2<? super EObject,? super FormattableDocument>
_and_2 = false;
} else {
Line _last_1 = IterableExtensions.<Line>last(lines);
- boolean _equals_1 = ObjectExtensions.operator_equals(line, _last_1);
+ boolean _equals_1 = Objects.equal(line, _last_1);
_and_2 = (canIndent && _equals_1);
}
if (_and_2) {
@@ -228,12 +228,12 @@ protected boolean hasSyntaxError(final EObject obj) {
{
final INode node = this._nodeModelAccess.nodeForEObject(obj);
boolean _or = false;
- boolean _equals = ObjectExtensions.operator_equals(node, null);
+ boolean _equals = Objects.equal(node, null);
if (_equals) {
_or = true;
} else {
SyntaxErrorMessage _syntaxErrorMessage = node.getSyntaxErrorMessage();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_syntaxErrorMessage, null);
+ boolean _notEquals = (!Objects.equal(_syntaxErrorMessage, null));
_or = (_equals || _notEquals);
}
if (_or) {
@@ -243,7 +243,7 @@ protected boolean hasSyntaxError(final EObject obj) {
final Function1<INode,Boolean> _function = new Function1<INode,Boolean>() {
public Boolean apply(final INode it) {
SyntaxErrorMessage _syntaxErrorMessage = it.getSyntaxErrorMessage();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_syntaxErrorMessage, null);
+ boolean _notEquals = (!Objects.equal(_syntaxErrorMessage, null));
return Boolean.valueOf(_notEquals);
}
};
View
4 ...eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/RichStringToLineModel.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.formatting;
+import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import java.util.List;
import java.util.Stack;
@@ -21,7 +22,6 @@
import org.eclipse.xtext.xbase.lib.Functions.Function2;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
@SuppressWarnings("all")
public class RichStringToLineModel extends ForLoopOnce {
@@ -181,7 +181,7 @@ public void announceNextLiteral(final RichStringLiteral object) {
this.contentStartOffset = this.lastLiteralEndOffset;
}
final INode node = this.nodeModelAccess.nodeForFeature(object, Literals.XSTRING_LITERAL__VALUE);
- boolean _notEquals = ObjectExtensions.operator_notEquals(node, null);
+ boolean _notEquals = (!Objects.equal(node, null));
if (_notEquals) {
int _offset = node.getOffset();
int _literalPrefixLenght = this.literalPrefixLenght(node);
View
22 ...ns/org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/formatting/XtendFormatter.java
@@ -7,6 +7,7 @@
*/
package org.eclipse.xtend.core.formatting;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.Arrays;
import java.util.Collection;
@@ -73,7 +74,6 @@
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IntegerRange;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
import org.eclipse.xtext.xtype.XFunctionTypeRef;
@@ -115,7 +115,7 @@ public void apply(final FormattingDataInit it) {
Function1<? super FormattableDocument,? extends Iterable<FormattingData>> _prepend_1 = this._formattingDataFactory.prepend(pkg, _function_1);
format.operator_add(_prepend_1);
final ILeafNode pkgSemicolon = this._nodeModelAccess.immediatelyFollowingKeyword(pkg, ";");
- boolean _notEquals = ObjectExtensions.operator_notEquals(pkgSemicolon, null);
+ boolean _notEquals = (!Objects.equal(pkgSemicolon, null));
if (_notEquals) {
final Procedure1<FormattingDataInit> _function_2 = new Procedure1<FormattingDataInit>() {
public void apply(final FormattingDataInit it) {
@@ -148,7 +148,7 @@ public void apply(final FormattingDataInit it) {
this.format(clazz, format);
EList<XtendTypeDeclaration> _xtendTypes_1 = xtendFile.getXtendTypes();
XtendTypeDeclaration _last = IterableExtensions.<XtendTypeDeclaration>last(_xtendTypes_1);
- boolean _notEquals_1 = ObjectExtensions.operator_notEquals(clazz, _last);
+ boolean _notEquals_1 = (!Objects.equal(clazz, _last));
if (_notEquals_1) {
INode _nodeForEObject_1 = this._nodeModelAccess.nodeForEObject(clazz);
final Procedure1<FormattingDataInit> _function_5 = new Procedure1<FormattingDataInit>() {
@@ -178,7 +178,7 @@ protected void _format(final XImportSection section, final FormattableDocument f
this.format(imp, format);
EList<XImportDeclaration> _importDeclarations_1 = section.getImportDeclarations();
XImportDeclaration _last = IterableExtensions.<XImportDeclaration>last(_importDeclarations_1);
- boolean _notEquals = ObjectExtensions.operator_notEquals(imp, _last);
+ boolean _notEquals = (!Objects.equal(imp, _last));
if (_notEquals) {
INode _nodeForEObject = this._nodeModelAccess.nodeForEObject(imp);
final Procedure1<FormattingDataInit> _function = new Procedure1<FormattingDataInit>() {
@@ -734,7 +734,7 @@ public void apply(final FormattingDataInit it) {
for (final XtendParameter param : parameters) {
{
XtendParameter _head = IterableExtensions.<XtendParameter>head(parameters);
- boolean _equals = ObjectExtensions.operator_equals(param, _head);
+ boolean _equals = Objects.equal(param, _head);
if (_equals) {
final Procedure1<FormattingDataInit> _function_1 = new Procedure1<FormattingDataInit>() {
public void apply(final FormattingDataInit it) {
@@ -745,7 +745,7 @@ public void apply(final FormattingDataInit it) {
Function1<? super FormattableDocument,? extends Iterable<FormattingData>> _append_1 = this._formattingDataFactory.append(open, _function_1);
format.operator_add(_append_1);
} else {
- boolean _notEquals = ObjectExtensions.operator_notEquals(comma, null);
+ boolean _notEquals = (!Objects.equal(comma, null));
if (_notEquals) {
final Procedure1<FormattingDataInit> _function_2 = new Procedure1<FormattingDataInit>() {
public void apply(final FormattingDataInit it) {
@@ -757,7 +757,7 @@ public void apply(final FormattingDataInit it) {
}
}
XtendParameter _last = IterableExtensions.<XtendParameter>last(parameters);
- boolean _equals_1 = ObjectExtensions.operator_equals(param, _last);
+ boolean _equals_1 = Objects.equal(param, _last);
if (_equals_1) {
INode _nodeForEObject = this._nodeModelAccess.nodeForEObject(param);
final Procedure1<FormattingDataInit> _function_3 = new Procedure1<FormattingDataInit>() {
@@ -790,7 +790,7 @@ public void apply(final FormattingDataInit it) {
{
boolean _fitsIntoLine = this.fitsIntoLine(format, param_1);
if (_fitsIntoLine) {
- boolean _equals = ObjectExtensions.operator_equals(comma_1, null);
+ boolean _equals = Objects.equal(comma_1, null);
if (_equals) {
final Procedure1<FormattingDataInit> _function_1 = new Procedure1<FormattingDataInit>() {
public void apply(final FormattingDataInit it) {
@@ -810,7 +810,7 @@ public void apply(final FormattingDataInit it) {
}
} else {
INode _xifexpression = null;
- boolean _equals_1 = ObjectExtensions.operator_equals(comma_1, null);
+ boolean _equals_1 = Objects.equal(comma_1, null);
if (_equals_1) {
_xifexpression = open;
} else {
@@ -949,7 +949,7 @@ public void apply(final FormattingDataInit it) {
Function1<? super FormattableDocument,? extends Iterable<FormattingData>> _prepend = this._formattingDataFactory.prepend(open, _function_4);
format.operator_add(_prepend);
XExpression _expression = func.getExpression();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_expression, null);
+ boolean _notEquals = (!Objects.equal(_expression, null));
if (_notEquals) {
final Procedure1<FormattingDataInit> _function_5 = new Procedure1<FormattingDataInit>() {
public void apply(final FormattingDataInit it) {
@@ -971,7 +971,7 @@ protected void _format(final XtendField field, final FormattableDocument documen
this.formatAnnotations(field, document, XbaseFormatterPreferenceKeys.newLineAfterFieldAnnotations);
this.formatModifiers(field, document);
String _name = field.getName();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_name, null);
+ boolean _notEquals = (!Objects.equal(_name, null));
if (_notEquals) {
INode _nodeForFeature = this._nodeModelAccess.nodeForFeature(field, Literals.XTEND_FIELD__TYPE);
final Procedure1<FormattingDataInit> _function = new Procedure1<FormattingDataInit>() {
View
8 ...se.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/ActiveAnnotationContextProvider.java
@@ -7,6 +7,7 @@
*/
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.Collection;
@@ -45,7 +46,6 @@
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Pair;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@@ -94,7 +94,7 @@ public void accept(final Pair<JvmAnnotationType,XAnnotation> it) {
JvmAnnotationType _key_1 = it.getKey();
final JvmType processorType = ActiveAnnotationContextProvider.this._xAnnotationExtensions.getProcessorType(_key_1);
final Object processorInstance = ActiveAnnotationContextProvider.this._processorInstanceForJvmTypeProvider.getProcessorInstance(processorType);
- boolean _notEquals = ObjectExtensions.operator_notEquals(processorInstance, null);
+ boolean _notEquals = (!Objects.equal(processorInstance, null));
if (_notEquals) {
fa.setProcessorInstance(processorInstance);
} else {
@@ -261,7 +261,7 @@ public Boolean apply(final XAnnotation it) {
for (final XAnnotation annotation : _filter) {
{
final JvmAnnotationType activeAnnotationDeclaration = this._xAnnotationExtensions.tryFindAnnotationType(annotation);
- boolean _notEquals = ObjectExtensions.operator_notEquals(activeAnnotationDeclaration, null);
+ boolean _notEquals = (!Objects.equal(activeAnnotationDeclaration, null));
if (_notEquals) {
boolean _isValid = this.isValid(annotation, activeAnnotationDeclaration);
if (_isValid) {
@@ -274,6 +274,6 @@ public Boolean apply(final XAnnotation it) {
}
private boolean isValid(final XAnnotation annotation, final JvmAnnotationType activeAnnotationDeclaration) {
- return ObjectExtensions.operator_notEquals(annotation, null);
+ return (!Objects.equal(annotation, null));
}
}
View
4 ...org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/CompilationContextImpl.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import org.eclipse.xtend.core.macro.declaration.CompilationUnitImpl;
import org.eclipse.xtend.core.xtend.XtendFile;
import org.eclipse.xtend.lib.macro.declaration.CompilationStrategy.CompilationContext;
@@ -12,7 +13,6 @@
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.eclipse.xtext.xbase.lib.Extension;
import org.eclipse.xtext.xbase.lib.Functions.Function0;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.util.ReflectExtensions;
@SuppressWarnings("all")
@@ -52,7 +52,7 @@ public ImportManager getImportManager(final ITreeAppendable appendable) {
public String toJavaCode(final TypeReference typeref) {
StringBuilderBasedAppendable _xifexpression = null;
- boolean _notEquals = ObjectExtensions.operator_notEquals(this.importManager, null);
+ boolean _notEquals = (!Objects.equal(this.importManager, null));
if (_notEquals) {
StringBuilderBasedAppendable _stringBuilderBasedAppendable = new StringBuilderBasedAppendable(this.importManager);
_xifexpression = _stringBuilderBasedAppendable;
View
4 ...tend.core/xtend-gen/org/eclipse/xtend/core/macro/ProcessorInstanceForJvmTypeProvider.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import com.google.inject.Singleton;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
@@ -9,7 +10,6 @@
import org.eclipse.xtext.resource.XtextResourceSet;
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.eclipse.xtext.xbase.lib.Functions.Function0;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
@Singleton
@SuppressWarnings("all")
@@ -53,7 +53,7 @@ public Object getProcessorInstance(final JvmType type) {
}
protected ClassLoader getClassLoader(final EObject ctx) {
- boolean _notEquals = ObjectExtensions.operator_notEquals(this.classLoader, null);
+ boolean _notEquals = (!Objects.equal(this.classLoader, null));
if (_notEquals) {
return this.classLoader;
}
View
10 ...eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/RegisterGlobalsContextImpl.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
@@ -15,7 +16,6 @@
import org.eclipse.xtext.common.types.JvmVisibility;
import org.eclipse.xtext.common.types.TypesFactory;
import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
import org.eclipse.xtext.xbase.lib.Pair;
@SuppressWarnings("all")
@@ -72,11 +72,11 @@ private void setNameAndAccept(final JvmDeclaredType newType, final String qualif
_compilationUnit.checkCanceled();
final Pair<String,String> namespaceAndName = this.getNameParts(qualifiedName);
String _key = namespaceAndName.getKey();
- boolean _notEquals = ObjectExtensions.operator_notEquals(_key, null);
+ boolean _notEquals = (!Objects.equal(_key, null));
if (_notEquals) {
String _key_1 = namespaceAndName.getKey();
final JvmDeclaredType parentType = this.findType(_key_1);
- boolean _notEquals_1 = ObjectExtensions.operator_notEquals(parentType, null);
+ boolean _notEquals_1 = (!Objects.equal(parentType, null));
if (_notEquals_1) {
EList<JvmMember> _members = parentType.getMembers();
_members.add(newType);
@@ -106,14 +106,14 @@ private JvmDeclaredType findRecursively(final String string, final Iterable<? ex
boolean _startsWith = string.startsWith(_identifier);
if (_startsWith) {
String _identifier_1 = type.getIdentifier();
- boolean _equals = ObjectExtensions.operator_equals(string, _identifier_1);
+ boolean _equals = Objects.equal(string, _identifier_1);
if (_equals) {
return type;
}
EList<JvmMember> _members = type.getMembers();
Iterable<JvmDeclaredType> _filter = Iterables.<JvmDeclaredType>filter(_members, JvmDeclaredType.class);
final JvmDeclaredType result = this.findRecursively(string, _filter);
- boolean _notEquals = ObjectExtensions.operator_notEquals(result, null);
+ boolean _notEquals = (!Objects.equal(result, null));
if (_notEquals) {
return result;
}
View
6 ....eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/TransformationContextImpl.java
@@ -1,5 +1,6 @@
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
import java.util.List;
@@ -27,7 +28,6 @@
import org.eclipse.xtend.lib.macro.services.TypeReferenceProvider;
import org.eclipse.xtext.common.types.JvmIdentifiableElement;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
@SuppressWarnings("all")
public class TransformationContextImpl implements TransformationContext {
@@ -70,7 +70,7 @@ public boolean isGenerated(final NamedElement element) {
CompilationUnitImpl _unit = this.getUnit();
XtendFile _xtendFile = _unit.getXtendFile();
Resource _eResource_1 = _xtendFile.eResource();
- return ObjectExtensions.operator_equals(_eResource, _eResource_1);
+ return Objects.equal(_eResource, _eResource_1);
}
}
if (!_matched) {
@@ -90,7 +90,7 @@ public MutableNamedElement getPrimaryGeneratedJavaElement(final NamedElement sou
Set<EObject> _jvmElements = this.associations.getJvmElements(_delegate);
Iterable<JvmIdentifiableElement> _filter = Iterables.<JvmIdentifiableElement>filter(_jvmElements, JvmIdentifiableElement.class);
final JvmIdentifiableElement derivedElement = IterableExtensions.<JvmIdentifiableElement>head(_filter);
- boolean _notEquals = ObjectExtensions.operator_notEquals(derivedElement, null);
+ boolean _notEquals = (!Objects.equal(derivedElement, null));
if (_notEquals) {
CompilationUnitImpl _unit = this.getUnit();
return _unit.toNamedElement(derivedElement);
View
10 .../org.eclipse.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/XAnnotationExtensions.java
@@ -7,6 +7,7 @@
*/
package org.eclipse.xtend.core.macro;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import java.util.List;
import org.eclipse.emf.common.util.EList;
@@ -43,7 +44,6 @@
import org.eclipse.xtext.xbase.annotations.xAnnotations.XAnnotationsPackage.Literals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
@SuppressWarnings("all")
public class XAnnotationExtensions {
@@ -197,7 +197,7 @@ public Boolean apply(final JvmAnnotationReference it) {
JvmAnnotationType _annotation = it.getAnnotation();
String _identifier = _annotation==null?(String)null:_annotation.getIdentifier();
String _name = Active.class.getName();
- boolean _equals = ObjectExtensions.operator_equals(_identifier, _name);
+ boolean _equals = Objects.equal(_identifier, _name);
return Boolean.valueOf(_equals);
}
};
@@ -207,13 +207,13 @@ public Boolean apply(final JvmAnnotationReference it) {
public Boolean apply(final JvmAnnotationValue it) {
boolean _or = false;
JvmOperation _operation = it.getOperation();
- boolean _equals = ObjectExtensions.operator_equals(_operation, null);
+ boolean _equals = Objects.equal(_operation, null);
if (_equals) {
_or = true;
} else {
JvmOperation _operation_1 = it.getOperation();
String _simpleName = _operation_1.getSimpleName();
- boolean _equals_1 = ObjectExtensions.operator_equals(_simpleName, "value");
+ boolean _equals_1 = Objects.equal(_simpleName, "value");
_or = (_equals || _equals_1);
}
return Boolean.valueOf(_or);
@@ -297,7 +297,7 @@ protected boolean isActiveAnnotation(final JvmAnnotationType annotationType) {
JvmAnnotationType _annotation = anno.getAnnotation();
String _identifier = _annotation.getIdentifier();
String _name = Active.class.getName();
- boolean _equals = ObjectExtensions.operator_equals(_identifier, _name);
+ boolean _equals = Objects.equal(_identifier, _name);
if (_equals) {
return true;
}
View
6 ...se.xtend.core/xtend-gen/org/eclipse/xtend/core/macro/declaration/CompilationUnitImpl.java
@@ -283,7 +283,7 @@ public void setXtendFile(final XtendFile xtendFile) {
private <IN extends EObject, OUT extends Object> OUT getOrCreate(final IN in, final Function1<? super IN,? extends OUT> provider) {
this.checkCanceled();
- boolean _equals = ObjectExtensions.operator_equals(in, null);
+ boolean _equals = Objects.equal(in, null);
if (_equals) {
return null;
}
@@ -620,7 +620,7 @@ public MutableDeclaration apply(final JvmIdentifiableElement it) {
public TypeReference toTypeReference(final JvmTypeReference delegate) {
TypeReference _xblockexpression = null;
{
- boolean _equals = ObjectExtensions.operator_equals(delegate, null);
+ boolean _equals = Objects.equal(delegate, null);
if (_equals) {
return null;
}