Skip to content

Commit

Permalink
Fix names
Browse files Browse the repository at this point in the history
  • Loading branch information
@boyter
boyter committed Apr 10, 2017
1 parent 01671e1 commit ef39f8e
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 41 deletions.
76 changes: 38 additions & 38 deletions include/classifier/database.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"keywords": ["nbsp", "class", "span", "font", "href", "html", "name", "code", "java", "title", "the", "org", "bgcolor", "com", "div", "line", "color", "table", "top", "http", "src", "green", "summary", "align", "interface", "lang", "width", "size", "apache", "api", "type", "xbird", "eeeeff", "docs", "pre", "valign", "sun", "method", "jmeter", "awt", "j2se", "white", "text", "border", "navbarcell1", "index", "string", "xquery", "navbarfont1", "cellpadding", "cellspacing", "navbar", "style", "object", "this", "mt4j", "xstream", "value", "right", "100", "strong", "thoughtworks", "javax", "util", "script", "public", "and", "for", "left", "tablerowcolor", "package", "all", "swing", "int", "true", "phpexcel", "from", "bottom", "target", "file", "component", "sym", "center", "detail", "colspan", "return", "var", "list", "body", "javascript", "function", "classes", "doc", "quot", "skip", "model", "that", "content", "noscript", "css", "external", "document", "www", "xml", "tree", "field", "constructor", "img", "tools", "benchmark", "components", "with", "new", "input", "inherited", "head", "void", "help", "use", "alt", "static", "link", "gui", "testelement", "overview", "deprecated", "not", "frames", "dtd", "event", "end", "you", "jdom", "meta", "net", "navbarcell2", "allclasses", "noframe", "data", "test", "methods", "jcomponent", "false", "returns", "gif", "boolean", "ccccff", "start", "a100parents", "php", "stylesheet", "specified", "ruby", "products", "next", "are", "height", "set", "tableheadingcolor", "ingatan", "window", "expr", "final", "func", "math", "protocol", "license", "files", "amp", "null", "extended", "comment", "ref", "keyword", "xmlrpc", "image", "will", "rel", "str", "get", "visiblecomponents", "nested", "sketchel", "models", "nokogiri", "long", "key", "source", "instance", "tablesubheadingcolor", "ffffff", "element", "worksheet", "whit", "writer", "onclick", "float", "attribute", "version", "can"]
},
{
"language": "MSBuildscripts",
"language": "MSBuild scripts",
"extensions": [
"csproj"
],
Expand Down Expand Up @@ -155,15 +155,15 @@
"keywords": []
},
{
"language": "Fortran77",
"language": "Fortran 77",
"extensions": [
"f",
"f77"
],
"keywords": []
},
{
"language": "Fortran90",
"language": "Fortran 90",
"extensions": [
"f90",
"f90"
Expand All @@ -188,15 +188,15 @@
"keywords": []
},
{
"language": "VisualBasic",
"language": "Visual Basic",
"extensions": [
"vbs",
"vb"
],
"keywords": []
},
{
"language": "BourneShell",
"language": "Bourne Shell",
"extensions": [
"sh",
"bash",
Expand Down Expand Up @@ -227,7 +227,7 @@
"keywords": []
},
{
"language": "ObjectiveC++",
"language": "Objective C++",
"extensions": [
"mm",
"m"
Expand Down Expand Up @@ -257,7 +257,7 @@
"keywords": []
},
{
"language": "RubyHTML",
"language": "Ruby HTML",
"extensions": [
"rhtml"
],
Expand All @@ -272,7 +272,7 @@
"keywords": []
},
{
"language": "BourneAgainShell",
"language": "Bourne Again Shell",
"extensions": [
"sh",
"bash",
Expand Down Expand Up @@ -459,7 +459,7 @@
"keywords": []
},
{
"language": "NAntscripts",
"language": "NAnt scripts",
"extensions": [
"build"
],
Expand Down Expand Up @@ -526,21 +526,21 @@
"keywords": []
},
{
"language": "KornShell",
"language": "Korn Shell",
"extensions": [
"ksh"
],
"keywords": []
},
{
"language": "Fortran95",
"language": "Fortran 95",
"extensions": [
"f95"
],
"keywords": []
},
{
"language": "OracleForms",
"language": "Oracle Forms",
"extensions": [
"fmt"
],
Expand Down Expand Up @@ -574,14 +574,14 @@
"keywords": []
},
{
"language": "OracleReports",
"language": "Oracle Reports",
"extensions": [
"rex"
],
"keywords": []
},
{
"language": "SoftbridgeBasic",
"language": "Softbridge Basic",
"extensions": [
"sbl"
],
Expand All @@ -602,7 +602,7 @@
"keywords": []
},
{
"language": "FreemarkerTemplate",
"language": "Freemarker Template",
"extensions": [
"ftl"
],
Expand Down Expand Up @@ -754,7 +754,7 @@
"keywords": []
},
{
"language": "ScalableVectorGraphics",
"language": "Scalable Vector Graphics",
"extensions": [
"svg"
],
Expand Down Expand Up @@ -789,7 +789,7 @@
"keywords": []
},
{
"language": "WolframLanguage",
"language": "Wolfram Language",
"extensions": [
"wl"
],
Expand Down Expand Up @@ -845,35 +845,35 @@
"keywords": []
},
{
"language": "RubyTemplate",
"language": "Ruby Template",
"extensions": [
"erb"
],
"keywords": []
},
{
"language": "XMLResource",
"language": "XML Resource",
"extensions": [
"resx"
],
"keywords": []
},
{
"language": "VarnishConfiguration",
"language": "Varnish Configuration",
"extensions": [
"vcl"
],
"keywords": []
},
{
"language": "JadeTemplate",
"language": "Jade Template",
"extensions": [
"jade"
],
"keywords": []
},
{
"language": "ReStructuredText",
"language": "ReStructured Text",
"extensions": [
"rst"
],
Expand All @@ -887,14 +887,14 @@
"keywords": []
},
{
"language": "RazorTemplate",
"language": "Razor Template",
"extensions": [
"cshtml"
],
"keywords": []
},
{
"language": "HandlebarsTemplate",
"language": "Handlebars Template",
"extensions": [
"hbs"
],
Expand Down Expand Up @@ -922,28 +922,28 @@
"keywords": []
},
{
"language": "VisualNDepend",
"language": "Visual NDepend",
"extensions": [
"ndproj"
],
"keywords": []
},
{
"language": "DeviceTreeSource",
"language": "Device Tree Source",
"extensions": [
"dts"
],
"keywords": []
},
{
"language": "ASP.NETWebHandler",
"language": "ASP.NET WebHandler",
"extensions": [
"ashx"
],
"keywords": []
},
{
"language": "GherkinSpecification",
"language": "Gherkin Specification",
"extensions": [
"feature"
],
Expand All @@ -957,28 +957,28 @@
"keywords": []
},
{
"language": "QtMetaLanguage",
"language": "Qt Meta Language",
"extensions": [
"qml"
],
"keywords": []
},
{
"language": "StyleSheeteXtender",
"language": "Style Sheet eXtender",
"extensions": [
"cssx"
],
"keywords": []
},
{
"language": "ScratchProjectFile",
"language": "Scratch Project File",
"extensions": [
"sb"
],
"keywords": []
},
{
"language": "PrecompiledHeader",
"language": "Precompiled Header",
"extensions": [
"pch"
],
Expand All @@ -992,7 +992,7 @@
"keywords": []
},
{
"language": "PortageInstaller",
"language": "Portage Installer",
"extensions": [
"ebuild"
],
Expand All @@ -1006,7 +1006,7 @@
"keywords": []
},
{
"language": "JenkinsBuildfile",
"language": "Jenkins Buildfile",
"extensions": [
"jenkinsfile"
],
Expand All @@ -1020,28 +1020,28 @@
"keywords": []
},
{
"language": "PropertiesFile",
"language": "Properties File",
"extensions": [
"properties"
],
"keywords": []
},
{
"language": "TagLibraryDescriptor",
"language": "Tag Library Descriptor",
"extensions": [
"tld"
],
"keywords": []
},
{
"language": "SyntacticallyAwesomeStyleSheets",
"language": "Syntactically Awesome Style Sheets",
"extensions": [
"scss"
],
"keywords": []
},
{
"language": "EmbeddedJavaScript",
"language": "Embedded JavaScript",
"extensions": [
"ejs"
],
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/searchcode/app/util/FileClassifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public String languageGuesser(String fileName, List<String> codeLines) {
}

// More then one possible match, check which one is most likely is and return that
String languageGuess = "";
String languageGuess = Values.EMPTYSTRING;
int bestKeywords = 0;

// This is hideous, need to look at performance at some point
Expand All @@ -83,8 +83,9 @@ public String languageGuesser(String fileName, List<String> codeLines) {
}
}

if (languageGuess == null || languageGuess.trim().equals(Values.EMPTYSTRING)) {
languageGuess = "Unknown";
// If there is still no decision then go for the first match
if (Singleton.getHelpers().isNullEmptyOrWhitespace(languageGuess)) {
return ((FileClassifierResult)matching[0]).language;
}

return languageGuess;
Expand Down

0 comments on commit ef39f8e

Please sign in to comment.