fix types

Author: nightwing

package.json

@@ -38,8 +38,8 @@
     "@codemirror/lang-xml": "^6.0.0",
     "@codemirror/language": "^6.1.0",
     "codemirror": "6.0.1",
-    "typescript": "^5.0.2",
-    "vite": "^2.9.6"
+    "typescript": "^5.7.3",
+    "vite": "^6.1.0"
   },
   "repository": {
     "type": "git",

src/cm_adapter.ts

@@ -152,8 +152,8 @@ export class CodeMirror {
     return wordChar.test(ch);
   };
   static keys: any = keys;
-  static addClass = function (el, str) { };
-  static rmClass = function (el, str) { };
+  static addClass = function (el: any, str: string) { };
+  static rmClass = function (el: any, str: string) { };
   static e_preventDefault = function (e: Event) {
     e.preventDefault()
   };
@@ -172,7 +172,7 @@ export class CodeMirror {
   static signal = signal;
 
   // --------------------------
-  openDialog(template: Element, callback: Function, options: any) {
+  openDialog(template: Element, callback: Function|undefined, options: any) {
     return openDialog(this, template, callback, options);
   };
   openNotification(template: Node, options: NotificationOptions) {
@@ -674,7 +674,7 @@ export class CodeMirror {
       curOp.cursorActivityHandlers = this._handlers["cursorActivity"] && this._handlers["cursorActivity"].slice();
     this.curOp.cursorActivity = true;
   };
-  operation(fn: Function, force?: boolean) {
+  operation<T>(fn: ()=>T, force?: boolean) {
     if (!this.curOp)
       this.curOp = { $d: 0 };
     this.curOp.$d++;
@@ -727,7 +727,7 @@ export class CodeMirror {
 
     }
   };
-  getOption(name:"firstLineNumber"|"tabSize"): number;
+  getOption(name:"firstLineNumber"|"tabSize"|"textwidth"): number;
   getOption(name:string): number|boolean|string|undefined;
   getOption(name: string) {
     switch (name) {
@@ -875,7 +875,7 @@ function hideDialog(cm: CodeMirror, dialog: Element) {
   }
 }
 
-function openDialog(me: CodeMirror, template: Element, callback: Function, options: any) {
+function openDialog(me: CodeMirror, template: Element, callback: Function|undefined, options: any) {
   if (!options) options = {};
 
   closeNotification(me, undefined);
@@ -913,7 +913,7 @@ function openDialog(me: CodeMirror, template: Element, callback: Function, optio
 
     CodeMirror.on(inp, "keydown", function (e: KeyboardEvent) {
       if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-      if (e.keyCode == 13) callback(inp.value);
+      if (e.keyCode == 13) callback && callback(inp.value);
       if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
         inp.blur();
         CodeMirror.e_stop(e);
@@ -968,7 +968,8 @@ function scanForBracket(cm: CodeMirror, where: Pos, dir: -1 | 1, style: any, con
   return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
 }
 
-function findMatchingTag(cm: CodeMirror, pos: Pos): undefined {
+function findMatchingTag(cm: CodeMirror, pos: Pos) {
+  return null;
 }
 
 function findEnclosingTag(cm: CodeMirror, pos: Pos) {
@@ -1029,7 +1030,7 @@ class Marker {
 
 
 
-function hardWrap(cm, options) {
+function hardWrap(cm: CodeMirror, options: {from: number, to: number, column?: number, allowMerge?: boolean}) {
   var max = options.column || cm.getOption('textwidth') || 80;
   var allowMerge = options.allowMerge != false;
 
@@ -1066,7 +1067,7 @@ function hardWrap(cm, options) {
   }
   return row;
 
-  function findSpace(line, max, min) {
+  function findSpace(line: string, max: number, min: number) {
     if (line.length < max)
       return;
     var before = line.slice(0, max);

src/types.d.ts

@@ -9,11 +9,19 @@ export type vimState = {
     marks: {[mark: string]: Marker}, 
     visualMode: boolean, 
     insertMode: boolean, 
-    pasteFn: any, 
-    lastSelection: any, 
-    searchState_: any, 
+    pasteFn?: any, 
+    lastSelection: {
+        anchorMark: Marker,
+        headMark: Marker,
+        visualLine: boolean,
+        visualBlock: boolean,
+        visualMode: boolean,
+        anchor: Pos,
+        head: Pos,
+    }, 
+    searchState_?: SearchStateInterface, 
     lastEditActionCommand: actionCommand|void, 
-    lastPastedText: any, 
+    lastPastedText?: string, 
     lastMotion: any, 
     options: {[optionName: string]: vimOption}, 
     lastEditInputState: InputStateInterface|void, 
@@ -29,7 +37,6 @@ export type vimState = {
     exMode?: boolean,
     mode?: any,
     expectLiteralNext?: boolean,
-    constructor(): void;
 }
 export type Marker = ReturnType<CodeMirror["setBookmark"]>
 export type LineHandle = ReturnType<CodeMirror["getLineHandle"]>
@@ -67,7 +74,12 @@ export type OperatorArgs = {
     toLower?: boolean,
     shouldMoveCursor?: boolean,
     selectedCharacter?: string,
-    lastSel?: any;
+    lastSel?: {
+        head: Pos,
+        anchor: Pos,
+        visualLine: boolean,
+        visualBlock: boolean,
+    },
     keepCursor?: boolean;
 } 
 // version of CodeMirror with vim state checked
@@ -173,7 +185,18 @@ export type vimMotions = {
     [key: string]: MotionFn
 }
 
-
+export type exCommandDefinition = {
+    name: string,
+    shortName?: string,
+    possiblyAsync?: boolean,
+    excludeFromCommandHistory?: boolean,
+    argDelimiter?: string,
+    type? : string,
+    toKeys? : string,
+    toInput?: string,
+    user?: boolean,
+    noremap?: boolean,
+};
 
 export type optionCallback = (value?: string|undefined, cm?: CodeMirror) => any
 export type vimOption = {
@@ -224,7 +247,9 @@ export type operatorMotionCommand = allCommands & {
     operator: string,
     motionArgs?: MotionArgsPartial,
     operatorArgs?: OperatorArgs,
-    operatorMotionArgs?: { [arg: string]: boolean | string },
+    operatorMotionArgs?: { 
+        visualLine?: boolean,
+    },
 }
 export type idleCommand = allCommands & { type: 'idle' }
 export type exCommand = allCommands & { type: 'ex' }
@@ -253,14 +278,36 @@ export interface InputStateInterface {
     motionArgs: MotionArgs | null;
     keyBuffer: any[];
     registerName?: string;
-    changeQueue: any;
+    changeQueue: null | { inserted: string, removed: string[]};
     operatorShortcut?: string;
     selectedCharacter?: string;
     repeatOverride?: number;
     changeQueueList?: any[];
     pushRepeatDigit(n: string): void;
     getRepeat(): number;
 }
+export interface SearchStateInterface {
+    setReversed(reversed: boolean): void;
+    isReversed(): boolean|undefined;
+    getQuery(): RegExp; 
+    setQuery(query: string|RegExp): void;
+    highlightTimeout: number|undefined;
+    getOverlay(): {
+        query: RegExp,
+    };
+    getScrollbarAnnotate(): any;
+    setScrollbarAnnotate(query: RegExp| null): void;
+    setOverlay(overlay: {query: RegExp}|null): void;
+}
+
+export type exCommandArgs = {
+    callback?: (() => void) | undefined; 
+    input?: string | undefined; 
+    line?: string | undefined;
+    commandName?: string | undefined;
+    argString?: string;
+    args?: string[]; 
+};
 
 export type vimExCommands = {
     colorscheme(cm: CodeMirrorV, params: vimExCommandsParams): void,
@@ -302,10 +349,9 @@ type vimExCommandsParams = {
     selectionLineEnd?: number
 }
 
-
 export type InsertModeChanges = {
-    changes: any;
-    expectCursorActivityForChange: any;
+    changes: any[];
+    expectCursorActivityForChange: boolean;
     visualBlock?: number,
     maybeReset?: boolean,
     ignoreCount?: number,
@@ -324,8 +370,17 @@ export type ExParams = {
     selectionLineEnd?: number,
 
     setCfg?: Object,
-    callback?: any,
+    callback?: () => void,
+}
 
+export type PromptOptions = {
+    onClose?: Function; 
+    prefix: string|HTMLElement;
+    desc?: string|HTMLElement; 
+    onKeyUp?: Function; 
+    onKeyDown: Function; 
+    value?: string; 
+    selectValueOnOpen?: boolean;
 }