Apply more settings for final newlines and whitespace

.vscode/settings.json

@@ -4,5 +4,8 @@
         "editor.formatOnSave": true
     },
     "typescript.tsdk": "node_modules/typescript/lib",
-    "editor.tabSize": 2
-}
+    "editor.tabSize": 2,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "files.trimTrailingWhitespace": true
+}

apps/vscode/.gitignore

@@ -1,2 +1,2 @@
 out/
-*.vsix
+*.vsix

apps/vscode/.vscodeignore

@@ -10,4 +10,3 @@ src/**
 **/*.map
 **/*.ts
 *.vsix
-

apps/vscode/.yarnrc

@@ -1 +1 @@
---ignore-engines true
+--ignore-engines true

apps/vscode/README.md

@@ -21,7 +21,6 @@ The easiest way to install is directly from within VS Code (search extensions fo
 
 You can also install from the [VS Code Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=quarto.quarto), the [Open VSX Registry](https://open-vsx.org/extension/quarto/quarto) or directly from a [VISX extension file](#visx-install).
 
-
 ## Render and Preview
 
 The Quarto VS Code extension includes commands and keyboard shortcuts for rendering Quarto documents (both standalone and within websites or books). After rendering, `quarto preview` is used behind the scenes to provide a preview pane within VS Code alongside your document:
@@ -44,7 +43,7 @@ When you execute **Preview Format**, you'll see a quick pick list of formats to
 
 ![](https://quarto.org/docs/tools/images/vscode-preview-format.png)
 
-After previewing a different format, the **Quarto: Preview** command and <kbd>Ctrl+Shift+K</kbd> keyboard shortcut will be automatically rebound to the newly selected format for the duration of the current preview. To switch back to previewing the original format, use  **Quarto: Preview Format** command again.
+After previewing a different format, the **Quarto: Preview** command and <kbd>Ctrl+Shift+K</kbd> keyboard shortcut will be automatically rebound to the newly selected format for the duration of the current preview. To switch back to previewing the original format, use **Quarto: Preview Format** command again.
 
 > Embedded preview is currently supported for HTML and PDF based formats (including `revealjs` and `beamer` slideshows). However, for Word and other formats you need to use an appropriate external program to preview the output.
 
@@ -64,7 +63,7 @@ However, you can configure the Quarto extension to automatically render whenever
 
 You might also want to control this behavior on a per-document or per-project basis. If you include the `editor: render-on-save` option in your document or project YAML it will supersede whatever your VS Code setting is. For example:
 
-``` yaml
+```yaml
 editor:
   render-on-save: true
 ```
@@ -75,7 +74,6 @@ If you prefer to use an external browser for preview (or have no preview trigger
 
 ![](https://quarto.org/docs/tools/images/vscode-preview-settings.png)
 
-
 ## Code Cells
 
 There are a variety of tools that make it easier to edit and execute

apps/vscode/assets/www/editor/.gitignore

@@ -1,2 +1,2 @@
 index.js
-style.css
+style.css

apps/vscode/languages/dot/dot.configuration.json

@@ -20,4 +20,4 @@
 			")"
 		]
 	]
-}
+}

apps/vscode/languages/mermaid/mermaid.configuration.json

@@ -16,4 +16,4 @@
 			")"
 		]
 	]
-}
+}

apps/vscode/languages/mermaid/mermaid.tmLanguage.json

@@ -883,4 +883,4 @@
     }
   },
   "scopeName": "source.mmd"
-}
+}

apps/vscode/languages/typst/typst.configuration.json

@@ -20,4 +20,4 @@
 			")"
 		]
 	]
-}
+}

apps/vscode/src/@types/hooks.d.ts

@@ -72,6 +72,3 @@ declare module 'positron' {
 		readonly previewPanel: PreviewPanel;
 	}
 }
-
-
-

apps/vscode/src/core/config.ts

@@ -19,8 +19,8 @@ export async function safeUpdateConfig(updateFn: () => Promise<void>) {
   try {
     await updateFn();
   } catch (error) {
-    // if the user's settings.json file is corrupt/invalid this 
+    // if the user's settings.json file is corrupt/invalid this
     // will throw an exception and prevent loading of the extension
     console.log("Unexpected error writing config (settings.json may be corrupt)");
   }
-}
+}

apps/vscode/src/core/hover.ts

@@ -57,4 +57,3 @@ export async function getSignatureHelpHover(
     triggerCharacter
   );
 }
-

apps/vscode/src/core/python.ts

@@ -71,4 +71,3 @@ export function pythonIsCondaEnv(python: string) {
     return false;
   }
 }
-

apps/vscode/src/core/terminal.ts

@@ -184,4 +184,3 @@ function requiredTerminalDelay(env?: TerminalEnv): number {
     return 0;
   }
 }
-

apps/vscode/src/core/workspace.ts

@@ -22,4 +22,4 @@ export function activeWorkspaceFolder(uri?: Uri): WorkspaceFolder | undefined {
       ? workspace.workspaceFolders[0]
       : undefined;
   return workspaceFolder;
-}
+}

apps/vscode/src/host/index.ts

@@ -105,4 +105,4 @@ function defaultExtensionHost(): ExtensionHost {
     },
     createPreviewPanel,
   };
-}
+}

apps/vscode/src/lsp/client.ts

@@ -349,5 +349,3 @@ function isWithinYamlComment(doc: TextDocument, pos: Position) {
   const line = doc.lineAt(pos.line).text;
   return !!line.match(/^\s*#\s*\| /);
 }
-
-

apps/vscode/src/main.ts

@@ -90,7 +90,7 @@ export async function activate(context: vscode.ExtensionContext) {
     const editorCommands = activateEditor(context, host, quartoContext, lspClient, engine);
     commands.push(...editorCommands);
 
-    // zotero 
+    // zotero
     const zoteroCommands = await activateZotero(context, lspClient);
     commands.push(...zoteroCommands);
 
@@ -130,4 +130,3 @@ export async function activate(context: vscode.ExtensionContext) {
 export async function deactivate() {
   return deactivateLsp();
 }
-

apps/vscode/src/providers/assist/render-assist.ts

@@ -64,7 +64,7 @@ export function renderWebviewHtml(webview: Webview, extensionUri: Uri) {
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
       <link href="${styleUri}" rel="stylesheet">
-      
+
       <title>Quarto Lens</title>
     </head>
     <body>

apps/vscode/src/providers/create/create.ts

@@ -41,4 +41,3 @@ export async function activateCreate(
     ),
   ];
 }
-

apps/vscode/src/providers/deno-config.ts

@@ -43,9 +43,3 @@ export function activateDenoConfig(context: ExtensionContext, engine: MarkdownEn
     workspace.onDidSaveTextDocument(ensureDenoConfig, null, context.subscriptions);
   }
 }
-
-
-
-
-
-

apps/vscode/src/providers/editor/codeview.ts

@@ -133,7 +133,7 @@ function lspCellYamlOptionsCompletions(context: CodeViewCompletionContext, lspRe
   });
   // include language header (we offset cellEnd below accordingly)
   code.splice(context.cellBegin, 0, `{${context.language}}`);
-  // make request 
+  // make request
   return lspRequest(kCodeViewGetCompletions, [{
     ...context,
     code,
@@ -285,4 +285,4 @@ function mdStringToMdContent(mdString: MarkdownString): MarkupContent {
     kind: MarkupKind.Markdown,
     value: mdString.value
   };
-}
+}

apps/vscode/src/providers/editor/connection.ts

@@ -176,4 +176,4 @@ function webviewPanelPostMessageTarget(webviewPanel: WebviewPanel): JsonRpcPostM
       };
     }
   };
-}
+}

apps/vscode/src/providers/editor/editor.ts

@@ -116,12 +116,12 @@ export class VisualEditorProvider implements CustomTextEditorProvider {
     engine: MarkdownEngine
   ): Disposable {
 
-    // setup request transport 
+    // setup request transport
     const lspRequest = lspClientTransport(lspClient);
 
     // track edits in the active editor if its untitled. this enables us to recover the
     // content when we switch to an untitled document, which otherwise are just dropped
-    // on the floor by vscode 
+    // on the floor by vscode
     context.subscriptions.push(workspace.onDidChangeTextDocument(e => {
       const doc = window.activeTextEditor?.document;
       if (doc && isQuartoDoc(doc) && doc.isUntitled && (doc.uri.toString() === e.document.uri.toString())) {
@@ -326,7 +326,7 @@ export class VisualEditorProvider implements CustomTextEditorProvider {
       xref || sourcePos
     );
 
-    // editor container implementation   
+    // editor container implementation
     const host: VSCodeVisualEditorHost = {
 
       // editor is querying for context
@@ -632,7 +632,7 @@ function visualEditorTracker(): VisualEditorTracker {
         try {
           return editor.webviewPanel.active || (includeVisible && editor.webviewPanel.visible);
         } catch (err) {
-          // we've seen activeEditors hold on to references to disposed editors (can't on the 
+          // we've seen activeEditors hold on to references to disposed editors (can't on the
           // surface see how this would occur as we subscribe to dispose, but as an insurance
           // policy let's eat any exception that occurs, since a single zombie webviewPanel
           // would prevent rendering of other panels
@@ -668,7 +668,7 @@ function focusTracker(webviewPanel: WebviewPanel, editor: VSCodeVisualEditor): D
     }
   });
 
-  // periodically check for focus 
+  // periodically check for focus
   const timer = setInterval(async () => {
     // update focus state
     hasFocus = await editor.isFocused();

apps/vscode/src/providers/editor/images.ts

@@ -129,4 +129,3 @@ export function documentImageResolver(
     }
   };
 }
-

apps/vscode/src/providers/editor/prefs.ts

@@ -320,4 +320,3 @@ function writePerDocumentPrefs(document: TextDocument, prefs: PerDocumentPrefs)
   const storage = filePrefsStorage(document.uri.fsPath);
   writeFileSync(storage, JSON.stringify(prefs), { encoding: "utf8" });
 }
-

apps/vscode/src/providers/editor/sync.ts

@@ -21,19 +21,19 @@ import { isXRef, NavLocation, VSCodeVisualEditor, XRef } from "editor-types";
 
 import { getWholeRange } from "../../core/doc";
 
-/* Strategy for managing synchronization of edits between source and visual mode. 
+/* Strategy for managing synchronization of edits between source and visual mode.
 
-This is made more complicated by the fact that getting/setting visual editor markdown 
+This is made more complicated by the fact that getting/setting visual editor markdown
 is expensive (requires a pandoc round trip) so is throttled by 1 second. We also need
-to guard against edits pinging back and forth (esp. w/ the requirement on flushing all 
+to guard against edits pinging back and forth (esp. w/ the requirement on flushing all
 pending edits on save)
 
 For the visual editor syncing to external changes:
 
 1) Only accept external edits when NOT focused (once the visual editor is focused it
    is the definitive source of changes to the document)
 
-2) These external edits are throttled by 1 second so we don't get constant (expensive) 
+2) These external edits are throttled by 1 second so we don't get constant (expensive)
    refreshing of the visual editor when users type in the text editor.
 
 For the visual editor propagating its own changes:
@@ -65,9 +65,9 @@ export function editorSyncManager(
   navigation?: XRef | number
 ): EditorSyncManager {
 
-  // state: an update from the visual editor that we have yet to apply. we don't 
+  // state: an update from the visual editor that we have yet to apply. we don't
   // apply these on every keystoke b/c they are expensive. we poll to apply these
-  // udpates periodically and also apply them immediately on save and when the 
+  // udpates periodically and also apply them immediately on save and when the
   // visual editor instructs us to do so (e.g. when it loses focus)
   let pendingVisualEdit: unknown | undefined;
 
@@ -208,4 +208,3 @@ async function updateWorkspaceDocument(document: TextDocument, markdown: string)
   updateDocument(editor, document, markdown);
   await workspace.applyEdit(edit);
 };
-

apps/vscode/src/providers/editor/toggle.ts

@@ -76,7 +76,7 @@ export async function reopenEditorInSourceMode(
   // note pending switch to source
   VisualEditorProvider.recordPendingSwitchToSource(document);
 
-  // close editor (return immediately as if we don't then any 
+  // close editor (return immediately as if we don't then any
   // rpc method that calls this wil result in an error b/c the webview
   // has been torn down by the time we return)
   commands.executeCommand('workbench.action.closeActiveEditor').then(async () => {

apps/vscode/src/providers/preview/preview-env.ts

@@ -51,7 +51,7 @@ export class PreviewEnvManager {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       QUARTO_LOG: this.outputFile_,
 
-      // eslint-disable-next-line @typescript-eslint/naming-convention 
+      // eslint-disable-next-line @typescript-eslint/naming-convention
       QUARTO_RENDER_TOKEN: this.renderToken_,
 
       ...(await terminalEnv(uri))

apps/vscode/src/providers/zotero/zotero.ts

@@ -222,7 +222,7 @@ class ZoteroConfigureLibraryCommand implements Command {
     inputBox.placeholder = "Zotero Web API Key";
     inputBox.onDidAccept(async () => {
 
-      // get key 
+      // get key
       const apiKey = inputBox.value.trim();
 
       // helper to save it
@@ -366,4 +366,4 @@ async function safeReadZoteroApiKey(context: ExtensionContext) {
     console.log("Error reading zotero api key");
     return undefined;
   }
-}
+}

apps/vscode/src/vdoc/vdoc-completion.ts

@@ -53,4 +53,4 @@ export async function vdocCompletions(
     return completion;
   });
 
-}
+}

apps/vscode/src/vdoc/vdoc-tempfile.ts

@@ -38,8 +38,8 @@ export async function virtualDocUriFromTempFile(
   local: boolean
 ): Promise<VirtualDocUri> {
 
-  // if this is local then create it alongside the docPath and return a cleanup 
-  // function to remove it when the action is completed. 
+  // if this is local then create it alongside the docPath and return a cleanup
+  // function to remove it when the action is completed.
   if (local || virtualDoc.language.localTempFile) {
     const ext = virtualDoc.language.extension;
     const vdocPath = path.join(path.dirname(docPath), `.vdoc.${ext}`);