adding tests and export check

microsoft · Jan 27, 2025 · 8aa6673 · 8aa6673
1 parent 7bbb51f
commit 8aa6673
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/src/services/preparePasteEdits.ts b/src/services/preparePasteEdits.ts
@@ -2,11 +2,15 @@ import {
     findAncestor,
     forEachChild,
     getTokenAtPosition,
+    isExportAssignment,
+    isExportDeclaration,
+    isExportSpecifier,
     isIdentifier,
     isImportClause,
     isImportDeclaration,
     isImportEqualsDeclaration,
     isImportSpecifier,
+    isNamedExports,
     isNamedImports,
     isNamespaceImport,
     rangeContainsPosition,
@@ -32,8 +36,9 @@ export function preparePasteEdits(
         );
         if (!enclosingNode) return;
         if (
-            isImportSpecifier(enclosingNode) || isImportClause(enclosingNode) || isNamespaceImport(enclosingNode)
-            || isImportEqualsDeclaration(enclosingNode) || isImportDeclaration(enclosingNode) || isNamedImports(enclosingNode)
+            isImportSpecifier(enclosingNode) || isImportClause(enclosingNode) || isNamespaceImport(enclosingNode) || isImportEqualsDeclaration(enclosingNode)
+            || isImportDeclaration(enclosingNode) || isNamedImports(enclosingNode) || isExportSpecifier(enclosingNode) || isNamedExports(enclosingNode)
+            || isExportAssignment(enclosingNode) || isExportDeclaration(enclosingNode)
         ) {
             return;
         }

diff --git a/tests/cases/fourslash/preparePasteEdits_returnFalse.ts b/tests/cases/fourslash/preparePasteEdits_returnFalse.ts
@@ -1,7 +1,6 @@
 /// <reference path='./fourslash.ts' />
 
 // @Filename: /file1.ts
-//// [|import {abc} from "./file2";|]
 //// [|const a = 1;|]
 //// [|function foo() {
 ////     console.log("testing");}|]

diff --git a/tests/cases/fourslash/preparePasteEdits_returnFalseForImportAndExports.ts b/tests/cases/fourslash/preparePasteEdits_returnFalseForImportAndExports.ts
@@ -0,0 +1,21 @@
+/// <reference path='./fourslash.ts' />
+
+// @Filename: /file1.ts
+//// import {[|abc|]} from "[|./file2|]";
+//// import [|{q}|] from [|"./file3"|];
+//// [|import * as a from "./file2";|]
+//// 
+//// const b = 1;
+//// const c = 2;
+//// [|export {[|b|], c} from "./file1";|]
+
+// @Filename: /file2.ts
+//// export const abc = 1;
+
+// @Filename: /file3.ts
+//// export const q = 1;
+verify.preparePasteEdits({
+    copiedFromFile: "/file1.ts",
+    copiedTextRange: test.ranges(),
+    providePasteEdits: false,
+})
diff --git a/tests/cases/fourslash/preparePasteEdits_returnFalseForImportsAndExports2.ts b/tests/cases/fourslash/preparePasteEdits_returnFalseForImportsAndExports2.ts
@@ -0,0 +1,14 @@
+/// <reference path='./fourslash.ts' />
+
+// @allowJs: true
+// @module: commonjs
+
+// @Filename: /file1.ts
+//// [|import [|t|] = require("./file2");|]
+//// function add(a: number, b: number): number {
+////    return a + b;
+//// }
+//// [|export = add;|]
+
+// @Filename: /file2.ts
+//// export const t = 1;