feedback

Author: Artmann

build/esbuild/build.ts

@@ -141,7 +141,7 @@ function style({
             onLoad({ filter: /.*/, namespace: 'style-content' }, async (args) => {
                 // Process with PostCSS/Tailwind if enabled and file exists
                 if (enableTailwind && args.path.includes('tailwind.css') && fs.existsSync(args.path)) {
-                   try {
+                    try {
                         const cssContent = await fs.readFile(args.path, 'utf8');
                         const result = await postcss([tailwindcss, autoprefixer]).process(cssContent, {
                             from: args.path,
@@ -158,13 +158,11 @@ function style({
                         });
                         const { errors, warnings, outputFiles } = await esbuild.build(options);
                         return { errors, warnings, contents: outputFiles![0].text, loader: 'text' };
-                   } catch (error) {
-                       console.error(`PostCSS processing failed for ${args.path}:`, error);
-                       throw error;
-                   }
+                    } catch (error) {
+                        console.error(`PostCSS processing failed for ${args.path}:`, error);
+                        throw error;
+                    }
                 }
-                // …rest of the onLoad handler…
-            });
 
                 // Default behavior for other CSS files
                 const options = { entryPoints: [args.path], ...opt };
@@ -175,7 +173,9 @@ function style({
                         options.loader[key] = loader[key];
                     }
                 });
+
                 const { errors, warnings, outputFiles } = await esbuild.build(options);
+
                 return { errors, warnings, contents: outputFiles![0].text, loader: 'text' };
             });
         }

src/notebooks/deepnote/deepnoteRequirementsHelper.node.ts

@@ -41,11 +41,15 @@ export class DeepnoteRequirementsHelper implements IDeepnoteRequirementsHelper {
                 return;
             }
 
-            // Validate and normalize requirements: ensure they are valid strings, trim them, and remove empty entries
-            const normalizedRequirements = requirements
-                .filter((req) => typeof req === 'string') // Keep only string entries
-                .map((req) => req.trim()) // Trim whitespace
-                .filter((req) => req.length > 0); // Remove empty strings
+            // Validate and normalize requirements: ensure they are valid strings, trim them, remove empty entries, and dedupe
+            const normalizedRequirements = Array.from(
+                new Set(
+                    requirements
+                        .filter((req): req is string => typeof req === 'string') // Keep only string entries with type guard
+                        .map((req) => req.trim()) // Trim whitespace
+                        .filter((req) => req.length > 0) // Remove empty strings
+                )
+            );
 
             if (normalizedRequirements.length === 0) {
                 this.logger.info(`No valid requirements found in project ${project.project.id}`);
@@ -67,20 +71,25 @@ export class DeepnoteRequirementsHelper implements IDeepnoteRequirementsHelper {
             // Use Uri.joinPath to build the filesystem path using the Uri API
             const requirementsPath = Uri.joinPath(workspaceFolders[0].uri, 'requirements.txt').fsPath;
 
-            // Convert normalized requirements array to text format
+            // Convert normalized requirements array to text format (using LF line endings)
             const requirementsText = normalizedRequirements.join('\n') + '\n';
 
+            // Helper to normalize line endings to LF for comparison
+            const normalizeLineEndings = (text: string): string => text.replace(/\r\n/g, '\n');
+
             // Check if requirements.txt already exists
             const fileExists = await fs.promises
                 .access(requirementsPath)
                 .then(() => true)
                 .catch(() => false);
 
             if (fileExists) {
-                // Read existing file contents and compare
+                // Read existing file contents and compare (normalize line endings for comparison)
                 const existingContent = await fs.promises.readFile(requirementsPath, 'utf8');
+                const normalizedExistingContent = normalizeLineEndings(existingContent);
+                const normalizedRequirementsText = normalizeLineEndings(requirementsText);
 
-                if (existingContent === requirementsText) {
+                if (normalizedExistingContent === normalizedRequirementsText) {
                     this.logger.info('requirements.txt already has the correct content, skipping update');
                     return;
                 }

src/webviews/extension-side/dataframe/dataframeController.ts

@@ -2,6 +2,7 @@ import { injectable } from 'inversify';
 import {
     commands,
     env,
+    l10n,
     NotebookEdit,
     NotebookEditor,
     NotebookRendererMessaging,
@@ -86,9 +87,9 @@ export class DataframeController implements IExtensionSyncActivationService {
 
     private async handleSelectPageSize(editor: NotebookEditor, message: SelectPageSizeCommand) {
         if (!message.cellId && message.cellIndex === undefined) {
-            const errorMessage =
-                'Unable to update page size: No cell identifier provided. ' +
-                'Please re-run the cell to update the output metadata.';
+            const errorMessage = l10n.t(
+                'Unable to update page size: No cell identifier provided. Please re-run the cell to update the output metadata.'
+            );
 
             logger.error(`[DataframeController] ${errorMessage}`);
 
@@ -101,7 +102,10 @@ export class DataframeController implements IExtensionSyncActivationService {
         const cell = cells.find((c) => c.metadata.id === message.cellId);
 
         if (!cell) {
-            const errorMessage = `Unable to update page size: Could not find the cell with ID ${message.cellId}. The cell may have been deleted.`;
+            const errorMessage = l10n.t(
+                'Unable to update page size: Could not find the cell with ID {0}. The cell may have been deleted.',
+                message.cellId ?? ''
+            );
 
             logger.error(`[DataframeController] ${errorMessage}`);
 
@@ -140,9 +144,9 @@ export class DataframeController implements IExtensionSyncActivationService {
 
     private async handleGoToPage(editor: NotebookEditor, message: GoToPageCommand) {
         if (!message.cellId) {
-            const errorMessage =
-                'Unable to navigate to page: No cell identifier provided. ' +
-                'Please re-run the cell to update the output metadata.';
+            const errorMessage = l10n.t(
+                'Unable to navigate to page: No cell identifier provided. Please re-run the cell to update the output metadata.'
+            );
 
             logger.error(`[DataframeController] ${errorMessage}`);
 
@@ -155,7 +159,10 @@ export class DataframeController implements IExtensionSyncActivationService {
         const cell = cells.find((c) => c.metadata.id === message.cellId);
 
         if (!cell) {
-            const errorMessage = `Unable to navigate to page: Could not find the cell with ID ${message.cellId}. The cell may have been deleted.`;
+            const errorMessage = l10n.t(
+                'Unable to navigate to page: Could not find the cell with ID {0}. The cell may have been deleted.',
+                message.cellId ?? ''
+            );
 
             logger.error(`[DataframeController] ${errorMessage}`);