Pārlūkot izejas kodu

Remove inheritance of PartialJSONObject for ICompletionItem

Edward Zhao 5 gadi atpakaļ
vecāks
revīzija
ca6c3032c8
2 mainītis faili ar 14 papildinājumiem un 11 dzēšanām
  1. 2 7
      packages/completer/src/handler.ts
  2. 12 4
      packages/completer/src/model.ts

+ 2 - 7
packages/completer/src/handler.ts

@@ -7,12 +7,7 @@ import { Text } from '@jupyterlab/coreutils';
 
 import { IDataConnector } from '@jupyterlab/statedb';
 
-import {
-  ReadonlyJSONObject,
-  JSONObject,
-  JSONArray,
-  PartialJSONObject
-} from '@lumino/coreutils';
+import { ReadonlyJSONObject, JSONObject, JSONArray } from '@lumino/coreutils';
 
 import { IDisposable } from '@lumino/disposable';
 
@@ -567,7 +562,7 @@ export namespace CompletionHandler {
    * - custom icons
    * and other potential new features.
    */
-  export interface ICompletionItem extends PartialJSONObject {
+  export interface ICompletionItem {
     /**
      * User facing completion.
      * If insertText is not set, this will be inserted.

+ 12 - 4
packages/completer/src/model.ts

@@ -9,7 +9,7 @@ import {
   toArray
 } from '@lumino/algorithm';
 
-import { JSONExt } from '@lumino/coreutils';
+import { JSONExt, ReadonlyPartialJSONArray } from '@lumino/coreutils';
 
 import { StringExt } from '@lumino/algorithm';
 
@@ -185,7 +185,12 @@ export class CompleterModel implements Completer.IModel {
    * new types to KNOWN_TYPES.
    */
   setCompletionItems?(newValue: CompletionHandler.ICompletionItems): void {
-    if (JSONExt.deepEqual(newValue, this._completionItems)) {
+    if (
+      JSONExt.deepEqual(
+        (newValue as unknown) as ReadonlyPartialJSONArray,
+        (this._completionItems as unknown) as ReadonlyPartialJSONArray
+      )
+    ) {
       return;
     }
     this._completionItems = newValue;
@@ -390,9 +395,12 @@ export class CompleterModel implements Completer.IModel {
    * Highlight matching prefix by adding <mark> tags.
    */
   private _markup(query: string): CompletionHandler.ICompletionItems {
-    let items = JSONExt.deepCopy(this._completionItems);
+    let items = JSONExt.deepCopy(
+      (this._completionItems as unknown) as ReadonlyPartialJSONArray
+    );
     let results: CompletionHandler.ICompletionItem[] = [];
-    for (let item of items) {
+    for (let i of items) {
+      const item = (i as unknown) as CompletionHandler.ICompletionItem;
       // See if label matches query string
       let match = StringExt.matchSumOfSquares(item.label, query);
       if (match) {