Fix for #850: return non-null URI for CharArrayReaderSource instances

base/org.eclipse.jdt.groovy.core/META-INF/MANIFEST.MF

@@ -14,6 +14,7 @@ Export-Package: org.codehaus.jdt.groovy.integration.internal;x-internal:=true,
 Import-Package: org.eclipse.jdt.launching
 Require-Bundle: org.codehaus.groovy;bundle-version="[2.4.16,4)";visibility:=reexport,
  org.eclipse.core.expressions;visibility:=reexport,
+ org.eclipse.core.filesystem;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.core.variables,

base/org.eclipse.jdt.groovy.core/src/org/codehaus/jdt/groovy/control/EclipseSourceUnit.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,10 @@
  */
 package org.codehaus.jdt.groovy.control;
 
+import static org.eclipse.core.filesystem.URIUtil.toURI;
+
+import java.net.URI;
+
 import groovy.lang.GroovyClassLoader;
 
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -32,14 +36,19 @@ public class EclipseSourceUnit extends SourceUnit {
     public EclipseSourceUnit(/*@Nullable*/ IFile file, String filePath, char[] sourceCode, boolean isReconcile,
         CompilerConfiguration compilerConfig, GroovyClassLoader classLoader, ErrorCollector errorCollector, JDTResolver resolver) {
 
-        super(filePath, new CharArrayReaderSource(sourceCode), compilerConfig, classLoader, errorCollector);
+        super(filePath, new CharArrayReaderSource(sourceCode) {
+            @Override public URI getURI() {
+                return toURI(filePath);
+            }
+        }, compilerConfig, classLoader, errorCollector);
+
         this.file = file;
         this.resolver = resolver;
         this.isReconcile = isReconcile;
     }
 
     /**
-     * Will be null if workspace is closed (ie- batch compilation mode)
+     * Will be {@code null} if workspace is closed (ie- batch compilation mode).
      */
     public IFile getEclipseFile() {
         return file;

base/org.eclipse.jdt.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyLanguageSupport.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 package org.codehaus.jdt.groovy.integration.internal;
 
 import java.io.File;
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -180,10 +181,14 @@ public CompilationUnit newCompilationUnit(PackageFragment parent, String name, W
 
     @Override
     public CompilationUnitDeclaration newCompilationUnitDeclaration(ICompilationUnit icu, ProblemReporter problemReporter, CompilationResult compilationResult, int sourceLength) {
-        if (ContentTypeUtils.isGroovyLikeFileName(compilationResult.getFileName())) {
+        if (ContentTypeUtils.isGroovyLikeFileName(icu.getFileName())) {
 
-            String unitName = String.valueOf(compilationResult.getFileName());
-            ReaderSource unitSource = new CharArrayReaderSource(icu.getContents());
+            String unitName = String.valueOf(icu.getFileName());
+            ReaderSource unitSource = new CharArrayReaderSource(icu.getContents()) {
+                @Override public URI getURI() {
+                    return URI.create("platform:/resource" + unitName);
+                }
+            };
 
             if (problemReporter.options.groovyCompilerConfigScript != null) {
                 IWorkspace workspace = ResourcesPlugin.getWorkspace();

base/org.eclipse.jdt.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/MultiplexingCommentRecorderParser.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2018 the original author or authors.
+ * Copyright 2009-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -61,7 +61,7 @@ public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, Compila
     }
 
     private static boolean isGroovyLikeSourceUnit(ICompilationUnit sourceUnit) {
-        if (sourceUnit.getFileName() == null || !isJavaLikeButNotGroovyLikeFileName(String.valueOf(sourceUnit.getFileName()))) {
+        if (sourceUnit.getFileName() == null || !isJavaLikeButNotGroovyLikeFileName(new CharArraySequence(sourceUnit.getFileName()))) {
             if (GROOVY_SOURCE_DISCRIMINATOR.matcher(new CharArraySequence(sourceUnit.getContents())).find()) {
                 Util.log(1, "Identified a Groovy source unit through inspection of its contents: " +
                     String.valueOf(sourceUnit.getContents(), 0, Math.min(250, sourceUnit.getContents().length)));

ide-test/org.codehaus.groovy.eclipse.tests/META-INF/MANIFEST.MF

@@ -30,7 +30,6 @@ Import-Package: org.codehaus.groovy.eclipse.codebrowsing.requestor,
  org.eclipse.ui.views.contentoutline
 Require-Bundle: org.codehaus.groovy.eclipse.ui;bundle-version="3.3.0";visibility:=reexport,
  org.eclipse.jdt.groovy.core.tests.builder;bundle-version="3.3.0";visibility:=reexport,
- org.eclipse.core.filesystem;visibility:=reexport,
  org.eclipse.ui.editors;visibility:=reexport,
  org.eclipse.ui.forms;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport

ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/OutlineExtender1.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,6 +30,7 @@
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.compiler.CharOperation;
 
 public class OutlineExtender1 implements IOutlineExtender, IProjectNature {
 
@@ -63,7 +64,7 @@ public GroovyOutlinePage getGroovyOutlinePageForEditor(String contextMenuID, Gro
 
     @Override
     public boolean appliesTo(GroovyCompilationUnit unit) {
-        return new String(unit.getFileName()).contains("X");
+        return CharOperation.contains('X', unit.getFileName());
     }
 
     public static class TGroovyOutlinePage extends GroovyOutlinePage {

ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/OutlineExtender2.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,6 +27,7 @@
 import org.codehaus.groovy.eclipse.editor.outline.GroovyOutlinePage;
 import org.codehaus.jdt.groovy.model.GroovyCompilationUnit;
 import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.groovy.core.util.GroovyUtils;
 
 public class OutlineExtender2 extends OutlineExtender1 {
@@ -35,7 +36,7 @@ public class OutlineExtender2 extends OutlineExtender1 {
 
     @Override
     public boolean appliesTo(GroovyCompilationUnit unit) {
-        return new String(unit.getFileName()).contains("Y");
+        return CharOperation.contains('Y', unit.getFileName());
     }
 
     @Override

ide/org.codehaus.groovy.eclipse.astviews/META-INF/MANIFEST.MF

@@ -5,7 +5,6 @@ Bundle-Name: Groovy AST Views
 Bundle-Vendor: Pivotal Software, Inc.
 Bundle-Version: 3.3.0.qualifier
 Require-Bundle: org.codehaus.groovy.eclipse.ui;bundle-version="3.3.0",
- org.eclipse.core.filesystem,
  org.eclipse.ui.editors
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.codehaus.groovy.eclipse.astviews.Activator

ide/org.codehaus.groovy.eclipse.dsl/META-INF/MANIFEST.MF

@@ -21,7 +21,6 @@ Export-Package: org.codehaus.groovy.eclipse.dsl,
 Import-Package: org.eclipse.jdt.annotation
 Require-Bundle: org.codehaus.groovy.eclipse.codeassist.completion;bundle-version="3.3.0",
  org.codehaus.groovy.eclipse.ui;bundle-version="3.3.0",
- org.eclipse.core.filesystem,
  org.eclipse.ui.ide
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.codehaus.groovy.eclipse.dsl.GroovyDSLCoreActivator

ide/org.codehaus.groovy.eclipse.ui/META-INF/MANIFEST.MF

@@ -28,7 +28,6 @@ Import-Package: org.codehaus.groovy.frameworkadapter.util,
 Require-Bundle: org.codehaus.groovy.eclipse.codebrowsing;bundle-version="3.3.0",
  org.codehaus.groovy.eclipse.core;bundle-version="3.3.0";visibility:=reexport,
  org.codehaus.groovy.eclipse.refactoring;bundle-version="3.3.0",
- org.eclipse.core.filesystem,
  org.eclipse.debug.ui,
  org.eclipse.jdt.debug,
  org.eclipse.jdt.debug.ui,