fixes #1376 symbols search works like full text search

Author: tarzanek

src/org/opensolaris/opengrok/analysis/FileAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 package org.opensolaris.opengrok.analysis;
@@ -178,9 +178,12 @@ public String getFileTypeName() {
     public void analyze(Document doc, StreamSource src, Writer xrefOut) throws IOException {
         // not used
     }
-        
+    
+    // you analyzer HAS to override this to get proper symbols in results
+    protected JFlexTokenizer SymbolTokenizer=new PlainSymbolTokenizer();
+    
     @Override
-    public TokenStreamComponents createComponents(String fieldName) {        
+    protected TokenStreamComponents createComponents(String fieldName) {
         switch (fieldName) {
             case "full":
                 return new TokenStreamComponents(new PlainFullTokenizer());
@@ -189,7 +192,9 @@ public TokenStreamComponents createComponents(String fieldName) {
                 return new TokenStreamComponents(new PathTokenizer());
             case "hist":
                 return new HistoryAnalyzer().createComponents(fieldName);
-            case "refs":
+            case "refs": {                
+                return new TokenStreamComponents(SymbolTokenizer); 
+                  }            
             case "defs":
                 return new TokenStreamComponents(new PlainSymbolTokenizer());
             default:

src/org/opensolaris/opengrok/analysis/archive/BZip2Analyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.archive;
 
@@ -103,13 +103,5 @@ public InputStream getStream() throws IOException {
                 }
             }
         };
-    }
-
-    @Override
-    public TokenStreamComponents createComponents(String fieldName) {
-        if (fa != null) {
-            return fa.createComponents(fieldName);
-        }
-        return super.createComponents(fieldName);
-    }
+    }    
 }

src/org/opensolaris/opengrok/analysis/archive/GZIPAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.archive;
 
@@ -107,13 +107,5 @@ public InputStream getStream() throws IOException {
                         new GZIPInputStream(src.getStream()));
             }
         };
-    }
-
-    @Override
-    public TokenStreamComponents createComponents(String fieldName) {
-        if (fa != null) {
-            return fa.createComponents(fieldName);
-        }
-        return super.createComponents(fieldName);
-    }
+    }    
 }

src/org/opensolaris/opengrok/analysis/c/CAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.c;
 
@@ -27,7 +27,6 @@
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
 import org.opensolaris.opengrok.analysis.FileAnalyzerFactory;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -44,16 +43,13 @@ public class CAnalyzer extends AbstractSourceCodeAnalyzer {
 
     /**
      * Creates a new instance of CAnalyzer
+     * @param factory name
      */
     protected CAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
+        SymbolTokenizer=new CSymbolTokenizer(null);
     }
-    
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new CSymbolTokenizer(reader);
-    }
-
+        
     @Override
     protected JFlexXref newXref(Reader reader) {
         return new CXref(reader);

src/org/opensolaris/opengrok/analysis/c/CxxAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.c;
 
@@ -27,7 +27,6 @@
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
 import org.opensolaris.opengrok.analysis.FileAnalyzerFactory;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -42,15 +41,12 @@ public class CxxAnalyzer extends AbstractSourceCodeAnalyzer {
 
     /**
      * Creates a new instance of CAnalyzer
+     * @param factory name
      */
     protected CxxAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
-    }
-    
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new CxxSymbolTokenizer(reader);
-    }
+        SymbolTokenizer=new CxxSymbolTokenizer(null);    
+    }      
 
     @Override
     protected JFlexXref newXref(Reader reader) {

src/org/opensolaris/opengrok/analysis/clojure/ClojureAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.clojure;
 
@@ -27,7 +27,6 @@
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
 import org.opensolaris.opengrok.analysis.FileAnalyzerFactory;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -37,13 +36,9 @@ public class ClojureAnalyzer extends AbstractSourceCodeAnalyzer {
 
     protected ClojureAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
+        SymbolTokenizer=new ClojureSymbolTokenizer(null);    
     }
-
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new ClojureSymbolTokenizer(reader);
-    }
-
+    
     @Override
     protected JFlexXref newXref(Reader reader) {
         return new ClojureXref(reader);

src/org/opensolaris/opengrok/analysis/csharp/CSharpAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.csharp;
 
@@ -41,13 +41,9 @@ public class CSharpAnalyzer extends AbstractSourceCodeAnalyzer {
 
     protected CSharpAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
+        SymbolTokenizer=new CSharpSymbolTokenizer(null);    
     }
-
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new CSharpSymbolTokenizer(reader);
-    }
-
+   
     @Override
     protected JFlexXref newXref(Reader reader) {
         return new CSharpXref(reader);

src/org/opensolaris/opengrok/analysis/erlang/ErlangAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
  */
 
 package org.opensolaris.opengrok.analysis.erlang;
@@ -28,7 +28,6 @@
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
 import org.opensolaris.opengrok.analysis.FileAnalyzerFactory;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -38,21 +37,18 @@ public class ErlangAnalyzer extends AbstractSourceCodeAnalyzer {
 
     /**
      * Creates a new instance of ErlangAnalyzer
+     * @param factory name
      */
     protected ErlangAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
+        SymbolTokenizer=new ErlangSymbolTokenizer(null);    
     }
 
 //    @Override
 //    protected JFlexScopeParser newScopeParser(Reader reader) {
 //        return new ErlangScopeParser(reader);
 //    }
-
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new ErlangSymbolTokenizer(reader);
-    }
-
+   
     @Override
     protected JFlexXref newXref(Reader reader) {
         return new ErlangXref(reader);

src/org/opensolaris/opengrok/analysis/fortran/FortranAnalyzer.java

@@ -18,15 +18,14 @@
  */
 
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.analysis.fortran;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -41,13 +40,9 @@ public class FortranAnalyzer extends AbstractSourceCodeAnalyzer {
 
     FortranAnalyzer(FortranAnalyzerFactory factory) {
         super(factory);
+        SymbolTokenizer=new FortranSymbolTokenizer(null);    
     }
-
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new FortranSymbolTokenizer(reader);
-    }
-
+    
     @Override
     protected JFlexXref newXref(Reader reader) {
         return new FortranXref(reader);

src/org/opensolaris/opengrok/analysis/golang/GolangAnalyzer.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
  */
 
 package org.opensolaris.opengrok.analysis.golang;
@@ -28,7 +28,6 @@
 import java.io.Writer;
 import org.opensolaris.opengrok.analysis.Definitions;
 import org.opensolaris.opengrok.analysis.FileAnalyzerFactory;
-import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 import org.opensolaris.opengrok.analysis.JFlexXref;
 import org.opensolaris.opengrok.analysis.plain.AbstractSourceCodeAnalyzer;
 import org.opensolaris.opengrok.configuration.Project;
@@ -42,16 +41,12 @@ public class GolangAnalyzer extends AbstractSourceCodeAnalyzer {
 
     /**
      * Creates a new instance of GolangAnalyzer
-     * @param factory
+     * @param factory name
      */
     protected GolangAnalyzer(FileAnalyzerFactory factory) {
         super(factory);
-    }
-
-    @Override
-    protected JFlexTokenizer newSymbolTokenizer(Reader reader) {
-        return new GolangSymbolTokenizer(reader);
-    }
+        SymbolTokenizer=new GolangSymbolTokenizer(null);    
+    }   
 
     @Override
     protected JFlexXref newXref(Reader reader) {