Make snippets configurable in advanced settings #121

src/CodeSnippetService.ts

@@ -1,5 +1,8 @@
+import { JupyterFrontEnd } from '@jupyterlab/application';
 import { Settings } from '@jupyterlab/settingregistry';
-import { JSONArray, PartialJSONValue } from '@lumino/coreutils';
+import { JSONArray, JSONExt, PartialJSONValue } from '@lumino/coreutils';
+
+import { CodeSnippetWidget } from './CodeSnippetWidget';
 
 export interface ICodeSnippet {
  name: string;
@@ -16,15 +19,34 @@ export class CodeSnippetService {
  private static codeSnippetService: CodeSnippetService;
  private codeSnippetList: ICodeSnippet[];
 
- private constructor(settings: Settings) {
+ private constructor(settings: Settings, app: JupyterFrontEnd) {
  this.settingManager = settings;
 
  // just in case when user changes the snippets using settingsEditor
- this.settingManager.changed.connect((plugin) => {
+ this.settingManager.changed.connect(async (plugin) => {
  const newCodeSnippetList = plugin.get('snippets').user;
- this.codeSnippetList = this.convertToICodeSnippetList(
- newCodeSnippetList as JSONArray
- );
+
+ if (
+ !JSONExt.deepEqual(
+ newCodeSnippetList,
+ (this.codeSnippetList as unknown) as PartialJSONValue
+ )
+ ) {
+ this.codeSnippetList = this.convertToICodeSnippetList(
+ newCodeSnippetList as JSONArray
+ );
+
+ const leftWidgets = app.shell.widgets('left').iter();
+
+ let current = leftWidgets.next();
+ while (current) {
+ if (current instanceof CodeSnippetWidget) {
+ current.updateCodeSnippetWidget();
+ break;
+ }
+ current = leftWidgets.next();
+ }
+ }
  });
 
  const defaultSnippets = this.convertToICodeSnippetList(
@@ -56,9 +78,9 @@ export class CodeSnippetService {
  return snippetList;
  }
 
- static init(settings: Settings): void {
+ static init(settings: Settings, app: JupyterFrontEnd): void {
  if (!this.codeSnippetService) {
- this.codeSnippetService = new CodeSnippetService(settings);
+ this.codeSnippetService = new CodeSnippetService(settings, app);
  }
  }
 

src/CodeSnippetWidget.tsx

@@ -26,7 +26,6 @@ import { IDragEvent } from '@lumino/dragdrop';
 import { MimeData } from '@lumino/coreutils';
 
 import { CodeSnippetService, ICodeSnippet } from './CodeSnippetService';
-// import { CodeSnippetWidgetModel } from './CodeSnippetWidgetModel';
 import { CodeSnippetDisplay } from './CodeSnippetDisplay';
 import { CodeSnippetInputDialog } from './CodeSnippetInputDialog';
 
@@ -73,7 +72,6 @@ export class CodeSnippetWidget extends ReactWidget {
  this.app = app;
  this.editorServices = editorServices;
  this.getCurrentWidget = getCurrentWidget;
- // this._codeSnippetWidgetModel = new CodeSnippetWidgetModel([]);
  this.renderCodeSnippetsSignal = new Signal<this, ICodeSnippet[]>(this);
  this.codeSnippetManager = CodeSnippetService.getCodeSnippetService();
 

src/index.ts

@@ -34,17 +34,13 @@ import codeSnippetIconSVGstr from '../style/icon/jupyter_snippeticon.svg';
 
 import { CodeSnippetInputDialog } from './CodeSnippetInputDialog';
 import { CodeSnippetWidget } from './CodeSnippetWidget';
-// import { CodeSnippetContentsService } from './CodeSnippetContentsService';
 import {
  CodeSnippetEditor,
  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';
 
@@ -303,7 +299,7 @@ const codeSnippetExtensionSetting: JupyterFrontEndPlugin<void> = {
  void settingRegistry
  .load(CODE_SNIPPET_SETTING_ID)
  .then((settings) => {
- CodeSnippetService.init(settings as Settings);
+ CodeSnippetService.init(settings as Settings, app);
  console.log('JupyterLab extension code-snippets setting is activated!');
  })
  .catch((e) => console.log(e));