diff --git a/src/main/java/xyz/naofal/jtags/TreeVisitor.java b/src/main/java/xyz/naofal/jtags/TreeVisitor.java index 7341649..e64cf1a 100644 --- a/src/main/java/xyz/naofal/jtags/TreeVisitor.java +++ b/src/main/java/xyz/naofal/jtags/TreeVisitor.java @@ -76,7 +76,11 @@ public class TreeVisitor extends TreePathScanner { yield TagKind.METHOD; } }, - node.getName().toString(), + node.getReturnType() != null + ? node.getName().toString() + : ((ClassTree) getCurrentPath().getParentPath().getLeaf()) + .getSimpleName() + .toString(), p.getLocation(), p.getLine(node), node.getModifiers().getFlags().contains(Modifier.STATIC)); diff --git a/ttt b/ttt deleted file mode 100644 index c9644a5..0000000 --- a/ttt +++ /dev/null @@ -1,93 +0,0 @@ -!_TAG_EXTRA_DESCRIPTION anonymous /Include tags for non-named objects like lambda/ -!_TAG_EXTRA_DESCRIPTION fileScope /Include tags of file scope/ -!_TAG_EXTRA_DESCRIPTION pseudo /Include pseudo tags/ -!_TAG_EXTRA_DESCRIPTION subparser /Include tags generated by subparsers/ -!_TAG_FIELD_DESCRIPTION epoch /the last modified time of the input file (only for F\/file kind tag)/ -!_TAG_FIELD_DESCRIPTION file /File-restricted scoping/ -!_TAG_FIELD_DESCRIPTION input /input file/ -!_TAG_FIELD_DESCRIPTION name /tag name/ -!_TAG_FIELD_DESCRIPTION pattern /pattern/ -!_TAG_FIELD_DESCRIPTION typeref /Type and name of a variable or typedef/ -!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ -!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ -!_TAG_KIND_DESCRIPTION!Java a,annotation /annotation declarations/ -!_TAG_KIND_DESCRIPTION!Java c,class /classes/ -!_TAG_KIND_DESCRIPTION!Java e,enumConstant /enum constants/ -!_TAG_KIND_DESCRIPTION!Java f,field /fields/ -!_TAG_KIND_DESCRIPTION!Java g,enum /enum types/ -!_TAG_KIND_DESCRIPTION!Java i,interface /interfaces/ -!_TAG_KIND_DESCRIPTION!Java m,method /methods/ -!_TAG_KIND_DESCRIPTION!Java p,package /packages/ -!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ -!_TAG_OUTPUT_FILESEP slash /slash or backslash/ -!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ -!_TAG_OUTPUT_VERSION 0.0 /current.age/ -!_TAG_PARSER_VERSION!Java 0.0 /current.age/ -!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ -!_TAG_PROC_CWD /home/noon/code/java/jtags/ // -!_TAG_PROGRAM_AUTHOR Universal Ctags Team // -!_TAG_PROGRAM_NAME Universal Ctags /Derived from Exuberant Ctags/ -!_TAG_PROGRAM_URL https://ctags.io/ /official site/ -!_TAG_PROGRAM_VERSION 6.1.0 /v6.1.0/ -!_TAG_ROLE_DESCRIPTION!Java!package imported /imported package/ -A src/main/java/xyz/naofal/jtags/example/Example.java /^ A;$/;" e enum:Example.T file: -ANNOTATION src/main/java/xyz/naofal/jtags/TagKind.java /^ ANNOTATION,$/;" e enum:TagKind file: -CLASS src/main/java/xyz/naofal/jtags/TagKind.java /^ CLASS,$/;" e enum:TagKind file: -ENUM src/main/java/xyz/naofal/jtags/TagKind.java /^ ENUM,$/;" e enum:TagKind file: -ENUM_CONSTANT src/main/java/xyz/naofal/jtags/TagKind.java /^ ENUM_CONSTANT,$/;" e enum:TagKind file: -Example src/main/java/xyz/naofal/jtags/example/Example.java /^public class Example {$/;" c -FIELD src/main/java/xyz/naofal/jtags/TagKind.java /^ FIELD,$/;" e enum:TagKind file: -INTERFACE src/main/java/xyz/naofal/jtags/TagKind.java /^ INTERFACE,$/;" e enum:TagKind file: -Jtags src/main/java/xyz/naofal/jtags/Jtags.java /^public class Jtags {$/;" c -JtagsLogger src/main/java/xyz/naofal/jtags/JtagsLogger.java /^public class JtagsLogger {$/;" c -LogHandler src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public static class LogHandler extends Handler {$/;" c class:JtagsLogger -METHOD src/main/java/xyz/naofal/jtags/TagKind.java /^ METHOD;$/;" e enum:TagKind file: -Options src/main/java/xyz/naofal/jtags/Jtags.java /^ static class Options {$/;" c class:Jtags -PACKAGE src/main/java/xyz/naofal/jtags/TagKind.java /^ PACKAGE,$/;" e enum:TagKind file: -RECORD src/main/java/xyz/naofal/jtags/TagKind.java /^ RECORD,$/;" e enum:TagKind file: -T src/main/java/xyz/naofal/jtags/example/Example.java /^ enum T {$/;" g class:Example -T src/main/java/xyz/naofal/jtags/example/Example.java /^@interface T {$/;" a -TagCollector src/main/java/xyz/naofal/jtags/TagCollector.java /^public class TagCollector {$/;" c -TagKind src/main/java/xyz/naofal/jtags/TagKind.java /^public enum TagKind {$/;" g -TagsWriter src/main/java/xyz/naofal/jtags/TagsWriter.java /^public class TagsWriter {$/;" c -TreeVisitor src/main/java/xyz/naofal/jtags/TreeVisitor.java /^public class TreeVisitor extends TreePathScanner {$/;" c -TreeVisitorContext src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ public TreeVisitorContext(Trees trees) {$/;" m class:TreeVisitorContext -TreeVisitorContext src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^public class TreeVisitorContext {$/;" c -a src/main/java/xyz/naofal/jtags/example/Example.java /^ int a;$/;" f class:Example.T -close src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public void close() {$/;" m class:JtagsLogger.LogHandler -collectTags src/main/java/xyz/naofal/jtags/TagCollector.java /^ public static PriorityQueue collectTags(Options options) {$/;" m class:TagCollector -colors src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public static Map colors =$/;" f class:JtagsLogger.LogHandler -compilationUnitTree src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ public CompilationUnitTree compilationUnitTree;$/;" f class:TreeVisitorContext -compiler src/main/java/xyz/naofal/jtags/TagCollector.java /^ static JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();$/;" f class:TagCollector -flush src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public void flush() {$/;" m class:JtagsLogger.LogHandler -getLine src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ public String getLine(Tree node) {$/;" m class:TreeVisitorContext -getLocation src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ public String getLocation() {$/;" m class:TreeVisitorContext -getOffsetInSource src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ private long getOffsetInSource(CompilationUnitTree compilationUnitTree, Tree node) {$/;" m class:TreeVisitorContext file: -logger src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public static Logger logger = Logger.getLogger("logger");$/;" f class:JtagsLogger -loggingHandler src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public static Handler loggingHandler = new LogHandler();$/;" f class:JtagsLogger -lorem src/main/java/xyz/naofal/jtags/example/Example.java /^ public static void lorem($/;" m class:Example -main src/main/java/xyz/naofal/jtags/Jtags.java /^ public static void main(String[] args) {$/;" m class:Jtags -printUsage src/main/java/xyz/naofal/jtags/Jtags.java /^ static void printUsage() {$/;" m class:Jtags -publish src/main/java/xyz/naofal/jtags/JtagsLogger.java /^ public void publish(LogRecord record) {$/;" m class:JtagsLogger.LogHandler -run src/main/java/xyz/naofal/jtags/Jtags.java /^ static boolean run(Options options) {$/;" m class:Jtags -sourcePositions src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ final SourcePositions sourcePositions;$/;" f class:TreeVisitorContext -sources src/main/java/xyz/naofal/jtags/Jtags.java /^ String[] sources;$/;" f class:Jtags.Options -t src/main/java/xyz/naofal/jtags/example/Example.java /^ static int t = 1;$/;" f annotation:T -tags src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public final PriorityQueue tags = new PriorityQueue<>();$/;" f class:TreeVisitor -trees src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^ final Trees trees;$/;" f class:TreeVisitorContext -visitClass src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public Void visitClass(ClassTree node, TreeVisitorContext p) {$/;" m class:TreeVisitor -visitCompilationUnit src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public Void visitCompilationUnit(CompilationUnitTree node, TreeVisitorContext p) {$/;" m class:TreeVisitor -visitMethod src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public Void visitMethod(MethodTree node, TreeVisitorContext p) {$/;" m class:TreeVisitor -visitPackage src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public Void visitPackage(PackageTree node, TreeVisitorContext p) {$/;" m class:TreeVisitor -visitVariable src/main/java/xyz/naofal/jtags/TreeVisitor.java /^ public Void visitVariable(VariableTree node, TreeVisitorContext p) {$/;" m class:TreeVisitor -writeTag src/main/java/xyz/naofal/jtags/TagsWriter.java /^ private static void writeTag(Writer writer, Tag tag) throws IOException {$/;" m class:TagsWriter file: -writeTagsFile src/main/java/xyz/naofal/jtags/TagsWriter.java /^ public static void writeTagsFile(PriorityQueue tags, OutputStream outputStream) {$/;" m class:TagsWriter -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/Jtags.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/JtagsLogger.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/Tag.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/TagCollector.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/TagKind.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/TagsWriter.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/TreeVisitor.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags src/main/java/xyz/naofal/jtags/TreeVisitorContext.java /^package xyz.naofal.jtags;$/;" p -xyz.naofal.jtags.example src/main/java/xyz/naofal/jtags/example/Example.java /^package xyz.naofal.jtags.example;$/;" p