Add getCtagsLang() method

Also, use "powershell" not "Posh" for
OpenGrok customizations, to match the built-in
ctags language name as is done for e.g. "clojure"
and "pascal" and their OpenGrok-overriden
handling.

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AbstractAnalyzer.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 
@@ -34,7 +34,6 @@
 import org.opengrok.indexer.configuration.Project;
 
 /**
- *
  * @author Chandan
  */
 public abstract class AbstractAnalyzer extends Analyzer {
@@ -52,16 +51,25 @@ public AbstractAnalyzer(ReuseStrategy reuseStrategy) {
         super(reuseStrategy);
     }
 
+    /**
+     * Subclasses should override to return the case-insensitive name aligning
+     * with either a built-in Universal Ctags language name or an OpenGrok
+     * custom language name.
+     * @return a defined instance or {@code null} if the analyzer has no aligned
+     * Universal Ctags language
+     */
+    public abstract String getCtagsLang();
+
     public abstract long getVersionNo();
 
     /**
      * Subclasses should override to produce a value relevant for the evolution
      * of their analysis in each release.
      *
-     * @return 0
+     * @return 0 since {@link AbstractAnalyzer} is not specialized
      */
     protected int getSpecializedVersionNo() {
-        return 0; // FileAnalyzer is not specialized.
+        return 0;
     }
 
     public void setCtags(Ctags ctags) {

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java

@@ -242,20 +242,20 @@ private void addRustSupport(List<String> command) {
     }
 
     private void addPowerShellSupport(List<String> command) {
-        command.add("--langdef=Posh");
-        command.add("--langmap=Posh:+.ps1,Posh:+.psm1");
-        command.add("--regex-Posh=/\\$(\\{[^}]+\\})/\\1/v,variable/");
-        command.add("--regex-Posh=/\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1/v,variable/");
-        command.add("--regex-Posh=/^[[:space:]]*(:[^[:space:]]+)/\\1/l,label/");
-
-        command.add("--_fielddef-Posh=signature,signatures");
-        command.add("--fields-Posh=+{signature}");
+        command.add("--langdef=powershell");
+        command.add("--langmap=powershell:+.ps1,powershell:+.psm1");
+        command.add("--regex-powershell=/\\$(\\{[^}]+\\})/\\1/v,variable/");
+        command.add("--regex-powershell=/\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1/v,variable/");
+        command.add("--regex-powershell=/^[[:space:]]*(:[^[:space:]]+)/\\1/l,label/");
+
+        command.add("--_fielddef-powershell=signature,signatures");
+        command.add("--fields-powershell=+{signature}");
         // escaped variable markers
-        command.add("--regex-Posh=/`\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1//{exclusive}");
-        command.add("--regex-Posh=/`\\$(\\{[^}]+\\})/\\1//{exclusive}");
-        command.add("--regex-Posh=/#.*\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1//{exclusive}");
-        command.add("--regex-Posh=/#.*\\$(\\{[^}]+\\})/\\1//{exclusive}");
-        command.add("--regex-Posh=/^[[:space:]]*(function|filter)[[:space:]]+([^({[:space:]]+)[[:space:]]*" +
+        command.add("--regex-powershell=/`\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1//{exclusive}");
+        command.add("--regex-powershell=/`\\$(\\{[^}]+\\})/\\1//{exclusive}");
+        command.add("--regex-powershell=/#.*\\$([[:alnum:]_]+([:.][[:alnum:]_]+)*)/\\1//{exclusive}");
+        command.add("--regex-powershell=/#.*\\$(\\{[^}]+\\})/\\1//{exclusive}");
+        command.add("--regex-powershell=/^[[:space:]]*(function|filter)[[:space:]]+([^({[:space:]]+)[[:space:]]*" +
                 "(\\(([^)]+)\\))?/\\2/f,function,functions/{icase}{exclusive}{_field=signature:(\\4)}");
     }
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/FileAnalyzer.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
 
@@ -59,6 +59,14 @@ public class FileAnalyzer extends AbstractAnalyzer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileAnalyzer.class);
 
+    /**
+     * @return {@code null} as there is no aligned language
+     */
+    @Override
+    public String getCtagsLang() {
+        return null;
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ada/AdaAnalyzer.java

@@ -47,6 +47,14 @@ protected AdaAnalyzer(AnalyzerFactory factory) {
                 AbstractAnalyzer.DUMMY_READER)));
     }
 
+    /**
+     * @return {@code "Ada"}
+     */
+    @Override
+    public String getCtagsLang() {
+        return "Ada";
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/BZip2Analyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.archive;
 
@@ -58,6 +58,14 @@ protected BZip2Analyzer(AnalyzerFactory factory) {
         super(factory);
     }
 
+    /**
+     * @return {@code null} as there is no aligned language
+     */
+    @Override
+    public String getCtagsLang() {
+        return null;
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/GZIPAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.archive;
 
@@ -64,6 +64,14 @@ protected GZIPAnalyzer(AnalyzerFactory factory) {
         super(factory);
     }
 
+    /**
+     * @return {@code null} as there is no aligned language
+     */
+    @Override
+    public String getCtagsLang() {
+        return null;
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/TarAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.archive;
 
@@ -49,6 +49,14 @@ protected TarAnalyzer(AnalyzerFactory factory) {
         super(factory);
     }
 
+    /**
+     * @return {@code null} as there is no aligned language
+     */
+    @Override
+    public String getCtagsLang() {
+        return null;
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/archive/ZipAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.archive;
 
@@ -49,6 +49,14 @@ protected ZipAnalyzer(AnalyzerFactory factory) {
         super(factory);
     }
 
+    /**
+     * @return {@code null} as there is no aligned language
+     */
+    @Override
+    public String getCtagsLang() {
+        return null;
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.c;
 
@@ -48,6 +48,14 @@ protected CAnalyzer(AnalyzerFactory factory) {
                 AbstractAnalyzer.DUMMY_READER)));
     }
 
+    /**
+     * @return {@code "C"}
+     */
+    @Override
+    public String getCtagsLang() {
+        return "C";
+    }
+
     /**
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CxxAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis.c;
 
@@ -44,7 +44,15 @@ public class CxxAnalyzer extends AbstractSourceCodeAnalyzer {
     protected CxxAnalyzer(AnalyzerFactory factory) {
         super(factory, new JFlexTokenizer(new CxxSymbolTokenizer(
                 AbstractAnalyzer.DUMMY_READER)));
-    }      
+    }
+
+    /**
+     * @return {@code "C++"}
+     */
+    @Override
+    public String getCtagsLang() {
+        return "C++";
+    }
 
     /**
      * Gets a version number to be used to tag processed documents so that