fix:update 4.4.0

Author: guomingliang

other/hbuilderx-autotest/core/autoTestHandler/autoTestDef.d.ts

@@ -136,6 +136,21 @@ interface AutoTestSameWordCase extends AutoTestCase<SameWordExpect> {
     programData: string;
     programPlugin: string;
 }
+interface ExpandSelectionExpect {
+    begin: string;
+    end: string;
+    line?: string;
+}
+interface AutoTestExpandSelectionCase extends AutoTestCase<ExpandSelectionExpect> {
+    kind: 'expandSelection';
+    frequency: number;
+    range: Range;
+    docOffsetAt: number;
+    project: string;
+    lsDir: string;
+    programData: string;
+    programPlugin: string;
+}
 interface CommandExpect {
     lines: string[] | RegExp[];
     cursor?: Position;
@@ -216,4 +231,4 @@ interface AutoTestPerformanceCase extends AutoTestCase<PerformanceExpect> {
     timer: number;
     range: Range;
 }
-export { AutoEditExpect, AutoTestAutoEditCase, AutoTestCase, AutoTestCheckEditorCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestFoldCase, AutoTestFormatCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOpenFileCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase, AutoTestRetriggerCase, AutoTestSameWordCase, AutoTestCommandCase, CommandExpect, CompletionExpect, DbClickExpect, DefinitionExpect, ErrorExpect, FoldExpect, FormatExpect, HoverExpect, KeybindingExpect, OpenFileExpect, OutlineExpect, PerformanceExpect, ReferencesExpect, SameWordExpect, };
+export { AutoEditExpect, AutoTestAutoEditCase, AutoTestCase, AutoTestCheckEditorCase, AutoTestCommandCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestExpandSelectionCase, AutoTestFoldCase, AutoTestFormatCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOpenFileCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase, AutoTestRetriggerCase, AutoTestSameWordCase, CommandExpect, CompletionExpect, DbClickExpect, DefinitionExpect, ErrorExpect, FoldExpect, FormatExpect, HoverExpect, KeybindingExpect, OpenFileExpect, OutlineExpect, PerformanceExpect, ReferencesExpect, SameWordExpect };

other/hbuilderx-autotest/core/autoTestHandler/autoTestParse/expandSelection.d.ts

@@ -0,0 +1,3 @@
+import { ParseData } from '../utils';
+declare function parseExpandSelectionHandler(parseData: ParseData): import("../autoTestDef").AutoTestCase<any>;
+export { parseExpandSelectionHandler };

other/hbuilderx-autotest/core/caseHandler.d.ts

@@ -1,4 +1,4 @@
-import { AutoTestAutoEditCase, AutoTestCheckEditorCase, AutoTestCommandCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestFoldCase, AutoTestFormatCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOpenFileCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase, AutoTestRetriggerCase, AutoTestSameWordCase } from './autoTestHandler/autoTestDef';
+import { AutoTestAutoEditCase, AutoTestCheckEditorCase, AutoTestCommandCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestExpandSelectionCase, AutoTestFoldCase, AutoTestFormatCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOpenFileCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase, AutoTestRetriggerCase, AutoTestSameWordCase } from './autoTestHandler/autoTestDef';
 import { Editor } from './editor';
 declare function runDbClickCase(test: AutoTestDbClickCase, editor: Editor): Promise<({
     casename: string;
@@ -60,4 +60,5 @@ declare function runOpenFileCase(test: AutoTestOpenFileCase, config?: any): Prom
     message?: undefined;
 })[]>;
 declare function runCommandCase(test: AutoTestCommandCase, editor: Editor): Promise<any[]>;
-export { runAutoEditCase, runCheckEditor, runCommandCase, runCompletionCase, runDbClickCase, runDefinitionCase, runErrorCase, runFoldCase, runFormatCase, runHoverCase, runKeybindCase, runNoErrorCase, runOpenFileCase, runOutlineCase, runPerformanceCase, runReferencesCase, runRetriggerCase, runSameWordCase, runTypeAheadCase, };
+declare function runExpandSelectionCase(test: AutoTestExpandSelectionCase, editor: Editor): Promise<any[]>;
+export { runAutoEditCase, runCheckEditor, runCommandCase, runCompletionCase, runDbClickCase, runDefinitionCase, runErrorCase, runFoldCase, runFormatCase, runHoverCase, runKeybindCase, runNoErrorCase, runOpenFileCase, runOutlineCase, runPerformanceCase, runReferencesCase, runRetriggerCase, runSameWordCase, runTypeAheadCase, runExpandSelectionCase, };

other/hbuilderx-autotest/core/caseHandler/expandSelection.d.ts

@@ -0,0 +1,21 @@
+import { AutoTestExpandSelectionCase } from '../autoTestHandler/autoTestDef';
+import { Editor } from '../editor';
+declare class ExpandSelectionHandler {
+    private getTargetInfo;
+    private getMainInfo;
+    private isSameRange;
+    private getSortPosition;
+    /**
+     * 对比结果
+     */
+    private comparativeData;
+    private getSimplifiedTargetInfo;
+    /**
+     * 执行扩大选区测试用例
+     * @param test
+     * @param editor
+     * @returns
+     */
+    runExpandSelectionCase(test: AutoTestExpandSelectionCase, editor: Editor): Promise<any[]>;
+}
+export { ExpandSelectionHandler };

other/hbuilderx-autotest/core/editor.d.ts

@@ -62,6 +62,7 @@ export declare class Editor {
      * @returns
      */
     findSameWord(range: Range): Promise<Range[]>;
+    findExpandSelection(range: Range, frequency: number): Promise<Range[]>;
     focusProjectManager(): Promise<void>;
     runCommand(command: string): Promise<boolean>;
     close(): Promise<void>;

other/hbuilderx-autotest/core/hxdriver.d.ts

@@ -115,6 +115,13 @@ export declare class HBuilderX {
         x: number;
         y: number;
     }, tryCount?: number): Promise<void>;
+    /**
+     * 等待点击（点击）操作完成，不等待点击的后续任务是否执行，xy不传，默认是选中控件的中心
+     */
+    waitAndClickWithKeyModifier(selector: string, keyModifier: string, xy?: {
+        x: number;
+        y: number;
+    }, tryCount?: number): Promise<void>;
     /**
      * 等待点击（双击）操作完成，不等待点击的后续任务是否执行，xy不传，默认是选中控件的中心
      */

other/hbuilderx-autotest/core/keybinding.d.ts

@@ -29,4 +29,5 @@ interface KeyBindings {
     focusProjectManager: string;
 }
 declare let keyBindings: KeyBindings;
-export { keyBindings };
+declare function parseAndMatchKeys(hotkeyString: string): string;
+export { keyBindings, parseAndMatchKeys };

other/hbuilderx-autotest/core/utils.d.ts

@@ -49,6 +49,7 @@ export declare function fileCase(project: string, openfile: string, workbench: a
 }>;
 export declare function traverseDirectory(dir: string, includes?: string[], needSort?: boolean): string[];
 export declare function moveItemToFront(arr: string[], key: string): string[];
+export declare function moveItemToEnd(arr: string[], key: string): string[];
 export declare const directoryList: (dirPath: string) => string[];
 /**
  * 解析测试用例的期望路径

other/hbuilderx-autotest/core/workbench.d.ts

@@ -90,11 +90,11 @@ export declare class Workbench {
         delLine: string;
         selectAll: string;
         clipBoardHistory: string;
-        newUnTitledEditor: string;
-        'editor.action.triggerSuggest': string;
-        enter: string; /**
-         * 导入一个本地的项目到项目管理器，通过HBuilderX.exe project的形式
+        newUnTitledEditor: string; /**
+         * 测试框架hx实例
         */
+        'editor.action.triggerSuggest': string;
+        enter: string;
         down: string;
         esc: string;
         openAndCloseOutline: string;

other/hbuilderx-autotest/extension/command.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 运行单个测试用例
+ */
+declare function runSingleCase(params: any, output: any): Promise<void>;
+/**
+ * 运行某个文件夹的测试用例(确定不为项目根文件夹)
+ * @param params
+ * @param output
+ */
+declare function runFolderCase(params: any, output: any): Promise<void>;
+declare function runProjectCase(params: any, output: any): Promise<void>;
+declare function openFileToRange(baseUri: any, output: any): Promise<void>;
+export { runProjectCase, runFolderCase, runSingleCase, openFileToRange };