Fix for issue #277: Gradle plug-in's icon takes precedence for *.gradle

groovy · Apr 6, 2017 · f357cf9 · f357cf9
1 parent e1303c4
commit f357cf9
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 155 deletions.
diff --git a/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyLanguageSupport.java b/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyLanguageSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2016 the original author or authors.
+ * Copyright 2009-2017 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.
@@ -182,7 +182,7 @@ public boolean isSourceFile(String fileName, boolean isInterestingProject) {
         if (isInterestingProject) {
             return Util.isJavaLikeFileName(fileName);
         } else {
-            return ContentTypeUtils.isJavaLikeButNotGroovyLikeExtension(fileName);
+            return ContentTypeUtils.isJavaLikeButNotGroovyLikeFileName(fileName);
         }
     }
 

diff --git a/...e/src/org/codehaus/jdt/groovy/integration/internal/MultiplexingCommentRecorderParser.java b/...e/src/org/codehaus/jdt/groovy/integration/internal/MultiplexingCommentRecorderParser.java
@@ -16,7 +16,7 @@
 package org.codehaus.jdt.groovy.integration.internal;
 
 import static org.eclipse.jdt.groovy.core.util.ContentTypeUtils.isGroovyLikeFileName;
-import static org.eclipse.jdt.groovy.core.util.ContentTypeUtils.isJavaLikeButNotGroovyLikeExtension;
+import static org.eclipse.jdt.groovy.core.util.ContentTypeUtils.isJavaLikeButNotGroovyLikeFileName;
 
 import java.util.regex.Pattern;
 
@@ -61,7 +61,7 @@ public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, Compila
     }
 
     private static boolean isGroovyLikeSourceUnit(ICompilationUnit sourceUnit) {
-        if (sourceUnit.getFileName() == null || !isJavaLikeButNotGroovyLikeExtension(String.valueOf(sourceUnit.getFileName()))) {
+        if (sourceUnit.getFileName() == null || !isJavaLikeButNotGroovyLikeFileName(String.valueOf(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)));