Merge pull request #182 from jahn96/defaultLanguage

Default language

Author: kpinnipa

src/CodeSnippetDisplay.tsx

@@ -26,6 +26,7 @@ import {
   pythonIcon,
   fileIcon,
   rKernelIcon,
+  markdownIcon,
 } from '@jupyterlab/ui-components';
 import { CodeEditor, IEditorServices } from '@jupyterlab/codeeditor';
 import * as nbformat from '@jupyterlab/nbformat';
@@ -669,6 +670,18 @@ export class CodeSnippetDisplay extends React.Component<
           />
         );
       }
+      case 'Gfm': {
+        return (
+          <markdownIcon.react
+            tag="span"
+            height="16px"
+            width="16px"
+            right="7px"
+            top="5px"
+            margin-right="3px"
+          />
+        );
+      }
       case 'Java': {
         return (
           <javaIcon.react

src/CodeSnippetInputDialog.ts

@@ -53,13 +53,15 @@ export interface IFileContainer extends JSONObject {
 export function CodeSnippetInputDialog(
   codeSnippetWidget: CodeSnippetWidget,
   code: string[],
+  language: string,
   idx: number
 ): Promise<Contents.IModel | null> {
   const tags: string[] = [];
   const codeSnippetManager = CodeSnippetService.getCodeSnippetService();
 
   const snippets = codeSnippetManager.snippets;
 
+  // get all active tags
   for (const snippet of snippets) {
     if (snippet.tags) {
       for (const tag of snippet.tags) {
@@ -70,14 +72,15 @@ export function CodeSnippetInputDialog(
     }
   }
 
-  const body: InputHandler = new InputHandler(tags);
+  const body: InputHandler = new InputHandler(tags, language);
 
   return showInputDialog(
     codeSnippetWidget,
     tags,
     idx,
     codeSnippetManager,
     code,
+    language,
     body
   );
 }
@@ -91,6 +94,7 @@ export function showInputDialog(
   idx: number,
   codeSnippetManager: CodeSnippetService,
   code: string[],
+  language: string,
   body: InputHandler
 ): Promise<Contents.IModel | null> {
   return showCodeSnippetForm({
@@ -112,6 +116,7 @@ export function showInputDialog(
         idx,
         codeSnippetManager,
         code,
+        language,
         body
       );
     } else {
@@ -255,8 +260,8 @@ class InputHandler extends Widget {
    * Construct a new "code snippet" dialog.
    * readonly inputNode: HTMLInputElement; <--- in Widget class
    */
-  constructor(tags: string[]) {
-    super({ node: Private.createInputNode(tags) });
+  constructor(tags: string[], language: string) {
+    super({ node: Private.createInputNode(tags, language) });
     this.addClass(FILE_DIALOG_CLASS);
   }
 
@@ -300,7 +305,7 @@ class Private {
   /**
    * Create the node for a code snippet form handler. This is what's creating all of the elements to be displayed.
    */
-  static createInputNode(tags: string[]): HTMLElement {
+  static createInputNode(tags: string[], language: string): HTMLElement {
     Private.allTags = tags;
     const body = document.createElement('form');
 
@@ -324,15 +329,17 @@ class Private {
     const languageInput = document.createElement('input');
     languageInput.className = CODE_SNIPPET_DIALOG_INPUT;
     languageInput.setAttribute('list', 'languages');
+    // capitalize the first character
+    languageInput.value = language[0].toUpperCase() + language.slice(1);
     languageInput.required = true;
     const languageOption = document.createElement('datalist');
     languageOption.id = 'languages';
     languageOption.onblur = Private.handleOnBlur;
 
     SUPPORTED_LANGUAGES.sort();
-    for (const language of SUPPORTED_LANGUAGES) {
+    for (const supportedLanguage of SUPPORTED_LANGUAGES) {
       const option = document.createElement('option');
-      option.value = language;
+      option.value = supportedLanguage;
       languageOption.appendChild(option);
     }
 

src/CodeSnippetLanguages.ts

@@ -67,6 +67,7 @@ export const SUPPORTED_LANGUAGES = [
   'F#',
   'Go',
   'Galileo',
+  'Gfm',
   'Erlang',
   'PARI/GP',
   'Aldor',

src/CodeSnippetWidget.tsx

@@ -31,6 +31,7 @@ import { CodeSnippetDisplay } from './CodeSnippetDisplay';
 import { CodeSnippetInputDialog } from './CodeSnippetInputDialog';
 
 import React from 'react';
+import { Notebook } from '@jupyterlab/notebook';
 
 /**
  * A class used to indicate a snippet item.
@@ -245,6 +246,13 @@ export class CodeSnippetWidget extends ReactWidget {
    * Handle the `'lm-drop'` event for the widget.
    */
   private async _evtDrop(event: IDragEvent): Promise<void> {
+    // TODO: get language from kernel
+    const notebook: Notebook = event.mimeData.getData('internal:cells')[0]
+      .parent;
+
+    const language = notebook.model.defaultKernelLanguage;
+    console.log(language);
+
     const data = this.findCellData(event.mimeData);
     if (data === undefined) {
       return;
@@ -300,7 +308,8 @@ export class CodeSnippetWidget extends ReactWidget {
     } else {
       // Handle the case where we are copying cells
       event.dropAction = 'copy';
-      CodeSnippetInputDialog(this, data, idx);
+
+      CodeSnippetInputDialog(this, data, language, idx);
     }
 
     // Reorder snippet just to make sure id's are in order.

src/index.ts

@@ -40,6 +40,11 @@ import {
   ICodeSnippetEditorMetadata,
 } from './CodeSnippetEditor';
 import { CodeSnippetService } from './CodeSnippetService';
+import { NotebookPanel } from '@jupyterlab/notebook';
+import { DocumentWidget } from '@jupyterlab/docregistry';
+// import { NotebookPanel } from '@jupyterlab/notebook';
+// import { ServerConnection, SettingManager } from '@jupyterlab/services';
+// import { URLExt } from '@jupyterlab/coreutils';
 
 const CODE_SNIPPET_EXTENSION_ID = 'code-snippet-extension';
 
@@ -178,6 +183,16 @@ function activateCodeSnippet(
     isToggled: () => toggled,
     iconClass: 'some-css-icon-class',
     execute: () => {
+      let language = '';
+      // get the language of document or notebook
+      if (app.shell.currentWidget instanceof NotebookPanel) {
+        language = (app.shell.currentWidget as NotebookPanel).sessionContext
+          .kernelPreference.language;
+      } else if (app.shell.currentWidget instanceof DocumentWidget) {
+        language = (app.shell.currentWidget as DocumentWidget).context.model
+          .defaultKernelLanguage;
+      }
+
       const highlightedCode = getSelectedText();
       if (highlightedCode === '') {
         //if user just right-clicks cell(s) to save
@@ -202,12 +217,14 @@ function activateCodeSnippet(
         CodeSnippetInputDialog(
           codeSnippetWidget,
           resultArray,
+          language,
           codeSnippetWidget.codeSnippetManager.snippets.length
         );
       } else {
         CodeSnippetInputDialog(
           codeSnippetWidget,
           highlightedCode.split('\n'),
+          language,
           codeSnippetWidget.codeSnippetManager.snippets.length
         );
       }