Add better language indication as well as more supported keywords

Author: cakedan

src/api/types.ts

@@ -1270,6 +1270,7 @@ export namespace RestResponsesRaw {
     content: string,
     error: string,
     files: Array<string>,
+    language: string,
     stats: {
       memory: string,
       time_compilation: number,

src/commands/prefixed/tools/code.ts

@@ -43,7 +43,7 @@ export default class CodeCommand extends BaseCommand<CommandArgs> {
   async run(context: Command.Context, args: CommandArgs) {
     const language = getCodeLanguage(args.code.language || args.language);
     if (!language) {
-      return editOrReply(context, 'Give me a valid language!');
+      return editOrReply(context, `Give me a valid language! (One of ${Formatter.Commands.ToolsCode.languagesText})`);
     }
     return Formatter.Commands.ToolsCode.createMessage(context, {
       code: args.code.text,

src/constants.ts

@@ -72,37 +72,37 @@ export enum CodeLanguages {
 export const CodeLanguagesToName = Object.freeze({
   [CodeLanguages.ADA]: ['ada'],
   [CodeLanguages.ASSEMBLY]: ['assembly', 'asm', 'nasm'],
-  [CodeLanguages.BASH]: ['bash'],
+  [CodeLanguages.BASH]: ['bash', 'sh', 'zsh'],
   [CodeLanguages.BRAINFUCK]: ['brainfuck', 'bf'],
-  [CodeLanguages.C]: ['c(gcc)', 'c'],
+  [CodeLanguages.C]: ['c', 'c(gcc)', 'h'],
   [CodeLanguages.C_CLANG]: ['c(clang)'],
-  [CodeLanguages.C_OBJECTIVE]: ['objective-c', 'oc', 'obj-c'],
-  [CodeLanguages.C_PLUS_PLUS]: ['c++(gcc)', 'c++', 'cpp'],
+  [CodeLanguages.C_OBJECTIVE]: ['objectivec', 'mm', 'objc', 'obj-c', 'obj-c++', 'objective-c++', 'objective-c', 'oc'],
+  [CodeLanguages.C_PLUS_PLUS]: ['c++', 'cpp', 'c++(gcc)', 'h++', 'hpp', 'cxx', 'hxx', 'cc', 'hh'],
   [CodeLanguages.C_PLUS_PLUS_CLANG]: ['c++(clang)'],
   [CodeLanguages.C_PLUS_PLUS_VC_PLUS_PLUS]: ['c++(vc++)'],
-  [CodeLanguages.C_SHARP]: ['c#'],
+  [CodeLanguages.C_SHARP]: ['c#', 'cs', 'csharp'],
   [CodeLanguages.C_VC]: ['c(vc)'],
-  [CodeLanguages.CLOJURE]: ['clojure'],
+  [CodeLanguages.CLOJURE]: ['clojure', 'clj'],
   [CodeLanguages.D]: ['d'],
   [CodeLanguages.DART]: ['dart'],
   [CodeLanguages.ELIXIR]: ['elixir', 'ex'],
-  [CodeLanguages.ERLANG]: ['erlang'],
-  [CodeLanguages.F_SHARP]: ['f#'],
-  [CodeLanguages.FORTRAN]: ['fortran', 'fort'],
-  [CodeLanguages.GO]: ['go'],
-  [CodeLanguages.HAXE]: ['haxe'],
+  [CodeLanguages.ERLANG]: ['erlang', 'erl'],
+  [CodeLanguages.F_SHARP]: ['f#', 'fs', 'fsharp'],
+  [CodeLanguages.FORTRAN]: ['fortran', 'fort', 'f90', 'f95'],
+  [CodeLanguages.GO]: ['go', 'golang'],
   [CodeLanguages.HASKELL]: ['haskell', 'hs'],
-  [CodeLanguages.JAVA]: ['java'],
-  [CodeLanguages.JAVASCRIPT]: ['javascript', 'js', 'node.js', 'node'],
-  [CodeLanguages.KOTLIN]: ['kotlin', 'kot'],
+  [CodeLanguages.HAXE]: ['haxe', 'hx'],
+  [CodeLanguages.JAVA]: ['java', 'jsp'],
+  [CodeLanguages.JAVASCRIPT]: ['javascript', 'js', 'node.js', 'node', 'jsx'],
+  [CodeLanguages.KOTLIN]: ['kotlin', 'kot', 'kt'],
   [CodeLanguages.LISP]: ['commonlisp', 'lisp'],
   [CodeLanguages.LUA]: ['lua'],
   //[CodeLanguages.MYSQL]: ['mysql'],
-  [CodeLanguages.OCAML]: ['ocaml'],
+  [CodeLanguages.OCAML]: ['ocaml', 'ml'],
   [CodeLanguages.OCTAVE]: ['octave'],
   [CodeLanguages.ORACLE]: ['oracle'],
   [CodeLanguages.PASCAL]: ['pascal'],
-  [CodeLanguages.PERL]: ['perl'],
+  [CodeLanguages.PERL]: ['perl', 'pl', 'pm'],
   [CodeLanguages.PHP]: ['php', 'php7'],
   //[CodeLanguages.POSTGRES_SQL]: ['postgresql', 'psql', 'postgres'],
   [CodeLanguages.PROLOG]: ['prolog'],
@@ -115,9 +115,9 @@ export const CodeLanguagesToName = Object.freeze({
   //[CodeLanguages.SCHEME]: ['scheme'],
   //[CodeLanguages.SQL_SERVER]: ['sqlserver'],
   [CodeLanguages.SWIFT]: ['swift'],
-  [CodeLanguages.TCL]: ['tcl'],
+  [CodeLanguages.TCL]: ['tcl', 'tk'],
   [CodeLanguages.TYPESCRIPT]: ['typescript', 'ts'],
-  [CodeLanguages.VB_NET]: ['visualbasic', 'vb'],
+  [CodeLanguages.VB_NET]: ['vbnet', 'visualbasic', 'vb'],
 });
 
 

src/utils/formatter/commands/tools.code.ts

@@ -4,10 +4,21 @@ import { Embed, Markup } from 'detritus-client/lib/utils';
 
 import { utilitiesCodeRun } from '../../../api';
 import {
+  CodeLanguages,
+  CodeLanguagesToName,
   EmbedBrands,
   EmbedColors,
 } from '../../../constants';
-import { createUserEmbed, editOrReply } from '../..';
+
+import { createUserEmbed, editOrReply, toTitleCase } from '../../tools';
+
+
+export const languagesText = Object.values(CodeLanguages).map((x: any) => {
+  if (x in CodeLanguagesToName) {
+    return Markup.codestring(toTitleCase((CodeLanguagesToName as any)[x][0]));
+  }
+  return Markup.codestring(toTitleCase(x));
+}).sort().join(', ');
 
 
 export const COMMAND_ID = 'tools code';
@@ -46,22 +57,24 @@ export async function createMessage(
     language: args.language,
   });
 
+  const language = args.language.toLowerCase().replace('_plus_plus', '++').replace('_sharp', '#');
+
   const embed = (isFromInteraction) ? new Embed() : createUserEmbed(context.user);
   embed.setColor(EmbedColors.DEFAULT);
 
-  let footer = 'Code Execution';
+  let footer = `${toTitleCase(language)} Code Execution`;
   if (stats.time_service && 1000 <= stats.time_service) {
     const seconds = (stats.time_service / 1000).toFixed(1);
     footer = `${footer}, took ${seconds} seconds`;
   }
   embed.setFooter(footer, EmbedBrands.NOTSOBOT);
 
-  const language = args.language.toLowerCase().replace('_plus_plus', '++').replace('_sharp', '#').split('_').shift()!;
+  const languageMarkupString = language.split('_').shift()!;
   if (error) {
     embed.setColor(EmbedColors.ERROR);
-    embed.setDescription(Markup.codeblock(error, {language}));
+    embed.setDescription(Markup.codeblock(error, {language: languageMarkupString}));
   } else if (content) {
-    embed.setDescription(Markup.codeblock(content, {language}));
+    embed.setDescription(Markup.codeblock(content, {language: languageMarkupString}));
   } else {
     embed.setDescription('No Content');
   }