GH-370: Update N4JS to Oxygen and Xtext 2.13 #637

qtran-n4 · 2018-02-20T09:32:47Z

This PR updates N4JS IDE to Oxygen and Xtext 2.13

…e version

szarnekow · 2018-02-22T10:46:40Z

...clipse.n4js.flowgraphs/src/org/eclipse/n4js/flowgraphs/analysers/DivisionByZeroAnalyser.java

@@ -57,7 +57,7 @@ static private boolean isZeroLiteral(Expression expr) {
 		if (expr instanceof NumericLiteral) {
 			NumericLiteral numLit = (NumericLiteral) expr;
 			BigDecimal litValue = numLit.getValue();
-			return litValue.equals(0);
+			return litValue.equals(new BigDecimal(0));


You may want to use BigDecimal.ZERO instead of the constructor.

szarnekow · 2018-02-22T10:53:27Z

...g/org.eclipse.n4js.releng.utils/src/org/eclipse/n4js/antlr/N4JSAntlrGeneratorFragment2.xtend

@@ -144,7 +144,7 @@ class N4JSAntlrGeneratorFragment2 extends N4AntlrGeneratorFragment2 {
 		}
 	}

-	private def boolean hasSyntheticTerminalRule() {
+	protected override boolean hasSyntheticTerminalRule() {


Is it different from the impl in the super class?

Yes it is. This method is now a protected method in the super class XtextAntlrGeneratorFragment2

szarnekow · 2018-02-22T10:56:10Z

...n4js.lang.tests/src/org/eclipse/n4js/tests/parser/ES_07_08_3_NumericLiteralEsprimaTest.xtend

@@ -187,7 +187,7 @@ class ES_07_08_3_NumericLiteralEsprimaTest extends AbstractParserTest {
 		val script = '0O127;'.parseSuccessfully
 		val statement = script.scriptElements.head as ExpressionStatement
 		val number = statement.expression as OctalIntLiteral
-		assertEquals(0127, number.toInt)
+		assertEquals(87, number.toInt)


I recommend to keep the octal literal in the expectation

@szarnekow Thanks for your review! Keeping the octal literal cause the assert to fail!

Interesting. I found the change in the Xbase codebase, that caused octal literals to work and stop working. There is such thing as a side-effect-free bugfix :)

so, are we keeping 87 or are we waiting for xbase update and then we go with the original test?

Xbase never had octal number literals, it only was a bug in the compiler

From the spec:

Number Literals Xbase supports roughly the same number literals as Java with a few notable differences. As in Java 7, you can separate digits using _ for better readability of large numbers. An integer literal represents an int, a long (suffix L) or even a BigInteger (suffix BI). There are no octal number literals.

So there won't be a fix. We either have to keep the 87, or use Integer.parseInt(127, 8) which I'd prefer

szarnekow · 2018-02-22T10:58:10Z

...s/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/scoping/InfiniteRecursionTest.xtend

-		val scriptAsString = CharStreams.toString[|
-			new InputStreamReader(class.getResourceAsStream("InfiniteComputationTest_02.txt"))
-		]
+		val fileURL = class.getResource("InfiniteComputationTest_02.txt")


Looks like you want to have a utiliy that does these three lines consistently. Also there is Resources.toString

Thanks for the hint!

szarnekow · 2018-02-22T10:58:37Z

...pse.n4js.ui.tests/src/org/eclipse/n4js/tests/projectModel/EclipseBasedProjectModelSetup.java

-				}, Charsets.UTF_8));
-
+				"}\n").getBytes(Charsets.UTF_8));
+		zipOutputStream.close();


try - finally or try-with-resource

yoosiba · 2018-02-22T14:44:55Z

releng/org.eclipse.n4js.targetplatform/N4JS.setup

      storageURI="scope://Workspace">
    <choice
-        value="N4JS_Neon.2.GH-18"
-        label="N4JS_Neon.2.GH-18"/>
+        value="N4JS_Oxygen.2.GH-369"


or just N4JS_Oxygen

yoosiba · 2018-02-22T14:46:37Z

releng/org.eclipse.n4js.targetplatform/N4JS.setup

@@ -514,8 +534,8 @@
      launcher="CreateConfigFileForSettingDefaultProduct">
    <description>Launch that creates a config.ini</description>
  </setupTask>
-  <stream name="master"
-      label="master (Oxygen)"/>
+  <stream name="GH-370"


change back to master before merging

yoosiba · 2018-02-22T14:47:14Z

releng/org.eclipse.n4js.targetplatform/org.eclipse.n4js.targetplatform.target

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated target-platform N4JS:N4JS_Neon.2.GH-18" sequenceNumber="135">
+<target name="Generated target-platform N4JS:N4JS_Oxygen.2.GH-369" sequenceNumber="141">


as with Oomph setup, change to Generated target-platform N4JS:N4JS_Oxygen" sequenceNumber="141

yoosiba · 2018-02-22T14:49:03Z

tests/org.eclipse.n4js.hlc.tests/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.n4js,
 org.eclipse.n4js.hlc,
 org.eclipse.n4js.hlc.base,
 org.junit,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava,


don't we need version in at least one place for Oomph to properly generate target platform file?

The generated Guava version is 18

yoosiba · 2018-02-22T14:50:57Z

...n4js.lang.tests/src/org/eclipse/n4js/tests/parser/ES_07_08_3_NumericLiteralEsprimaTest.xtend

@@ -187,7 +187,7 @@ class ES_07_08_3_NumericLiteralEsprimaTest extends AbstractParserTest {
 		val script = '0O127;'.parseSuccessfully
 		val statement = script.scriptElements.head as ExpressionStatement
 		val number = statement.expression as OctalIntLiteral
-		assertEquals(0127, number.toInt)
+		assertEquals(87, number.toInt)


so, are we keeping 87 or are we waiting for xbase update and then we go with the original test?

yoosiba · 2018-02-22T14:55:56Z

features/org.eclipse.n4js.dependencies.ui.sdk/feature.xml

@@ -56,6 +56,10 @@ Contributors:
         id="org.eclipse.wst.xml_ui.feature"
         version="0.0.0"/>

+   <includes
+         id="org.eclipse.epp.mpc"
+         version="0.0.0"/>


shouldn't this be added to the N4JS__IDE.launch ?

qtran-n4 · 2018-03-15T13:44:53Z

@mmews : IMPORTANT! Please change <stream name="GH-370" to <stream name="master" in N4JS.setup file before merging!

# Conflicts: # plugins/org.eclipse.n4js.ui/src/org/eclipse/n4js/ui/external/EclipseExternalLibraryWorkspace.java

Quang Tran added 30 commits February 5, 2018 15:49

GH-369: Update to oxygen

8d033c5

GH-369: Force guava version 15

4667534

GH-369: Force guava version 15

5817efa

GH-369: Force guava version 15

153de19

GH-369: Remove guava version

116fa9f

GH-369: Minor

b41186a

Update code to Guava 18

18ad850

Merge remote-tracking branch 'origin/master' into GH-369

f4605ce

GH-369 fix depricated errors and warnings due to newer Guava and jfac…

1023c9f

…e version

GH-369: Remove further warnings

705407b

Fix warnings

8dfbeec

Update target platform and generated code

e9f3f08

Fix version in pom

71eb586

Fix version

aa9ee13

Reverse version

8f0ec17

GH-369: Minor

6c20d34

Decrease EMF version back to 2.12

54c153d

Update generated code

69c8883

Updatate code generated from EMF Ecore 2.13

22ca987

do not launch MWE2 workflow nor xcore generation during Maven build

fb6b580

Remove emf version in pom and update emf to 2.13 in oomph setup

23438df

Update emf xcore

eb964c7

Reverse emf xcore version

92e1098

Update target platform

c08e018

Merge remote-tracking branch 'origin/master' into GH-369

b121e53

Merge remote-tracking branch 'origin/master' into GH-369

6a95f25

Use java 9 in docker file

31f8ea6

Use java 8

214f52f

Remove warnings

bbe070b

Review feedback 1

bf0f321

szarnekow reviewed Feb 22, 2018

View reviewed changes

yoosiba approved these changes Feb 22, 2018

View reviewed changes

Quang Tran added 3 commits February 27, 2018 15:57

Merge remote-tracking branch 'origin/master' into GH-370

488f303

Rename to N4JS_Oxygen

8cd8761

Review feedback

cdf4f83

mor-n4 closed this Mar 7, 2018

mor-n4 deleted the GH-370 branch March 7, 2018 12:50

mmews-n4 restored the GH-370 branch March 7, 2018 13:00

qtran-n4 reopened this Mar 7, 2018

qtran-n4 mentioned this pull request Mar 14, 2018

Add OS X Eclipse Launcher to the N4IDE product (macOS only) #679

Open

Quang Tran and others added 3 commits March 16, 2018 15:51

To 10G

662e980

8G

d4eb341

Merge remote-tracking branch 'origin/master' into GH-370

4947095

# Conflicts: # plugins/org.eclipse.n4js.ui/src/org/eclipse/n4js/ui/external/EclipseExternalLibraryWorkspace.java

mmews-n4 changed the title ~~GH-370: Update N4JS to Oxygen and Xtext 2.13~~ GH-369: Update N4JS to Oxygen and Xtext 2.13 Mar 29, 2018

mmews-n4 changed the title ~~GH-369: Update N4JS to Oxygen and Xtext 2.13~~ GH-370: Update N4JS to Oxygen and Xtext 2.13 Mar 29, 2018

Merge branch 'master' into GH-370

7b407a2

yoosiba mentioned this pull request Mar 29, 2018

Update to Xtext 2.13 and cleanup @szarnekow's changes #79

Open

Quang Tran added 5 commits April 23, 2018 11:39

Resolve conflict

d181469

Fix jenkinsfile.new

33e6b47

Use master's dockerfile

9e99b05

Add automatic module names

fa7be91

Change stream back to master before merge

1b267a1

qtran-n4 merged commit 680e2b1 into master Apr 24, 2018

qtran-n4 deleted the GH-370 branch May 8, 2018 09:48

yoosiba mentioned this pull request Jun 8, 2018

As a smith I need to bump Xtext from 2.12 to 2.13 #370

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GH-370: Update N4JS to Oxygen and Xtext 2.13 #637

GH-370: Update N4JS to Oxygen and Xtext 2.13 #637

qtran-n4 commented Feb 20, 2018 •

edited

szarnekow Feb 22, 2018

qtran-n4 Feb 27, 2018

szarnekow Feb 22, 2018

qtran-n4 Feb 27, 2018

szarnekow Feb 22, 2018

qtran-n4 Feb 22, 2018

szarnekow Feb 22, 2018

yoosiba Feb 22, 2018

szarnekow Feb 22, 2018 •

edited

szarnekow Feb 22, 2018

qtran-n4 Feb 27, 2018

szarnekow Feb 22, 2018

qtran-n4 Feb 27, 2018

szarnekow Feb 22, 2018

qtran-n4 Feb 27, 2018

yoosiba Feb 22, 2018

yoosiba Feb 22, 2018

yoosiba Feb 22, 2018

yoosiba Feb 22, 2018

qtran-n4 Feb 27, 2018

yoosiba Feb 22, 2018

yoosiba Feb 22, 2018

qtran-n4 Feb 27, 2018

qtran-n4 commented Mar 15, 2018 •

edited

GH-370: Update N4JS to Oxygen and Xtext 2.13 #637

GH-370: Update N4JS to Oxygen and Xtext 2.13 #637

Conversation

qtran-n4 commented Feb 20, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

szarnekow Feb 22, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qtran-n4 commented Mar 15, 2018 • edited

qtran-n4 commented Feb 20, 2018 •

edited

szarnekow Feb 22, 2018 •

edited

qtran-n4 commented Mar 15, 2018 •

edited