Merge pull request #781 from mjbvz/tsmf-tsx

Make sure tsx files have same formatting as ts files

Author: mjbvz

.editorconfig

@@ -1,3 +1,3 @@
-[*.ts]
+[*.{ts,tsx,js,jsx,json}]
 indent_style = tab
 tab_width = 4

notebook-renderer-react-sample/src/client/css.d.ts

@@ -1,4 +1,4 @@
-declare module '*.css' {
-  const classes: { [className: string]: string };
-  export = classes;
-}
+declare module '*.css' {
+	const classes: { [className: string]: string };
+	export = classes;
+}

notebook-renderer-react-sample/src/client/index.tsx

@@ -2,9 +2,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import './style.css';
 
-import { IssuesList } from './render';
 import errorOverlay from 'vscode-notebook-error-overlay';
 import type { ActivationFunction } from 'vscode-notebook-renderer';
+import { IssuesList } from './render';
 
 // ----------------------------------------------------------------------------
 // This is the entrypoint to the notebook renderer's webview client-side code.
@@ -14,33 +14,33 @@ import type { ActivationFunction } from 'vscode-notebook-renderer';
 // ----------------------------------------------------------------------------
 
 export const activate: ActivationFunction = context => {
-  return {
-    renderOutputItem(outputItem, element) {
-      let shadow = element.shadowRoot;
-      if (!shadow) {
-        shadow = element.attachShadow({ mode: 'open' });
-        const root = document.createElement('div');
-        root.id = 'root';
-        shadow.append(root);
-      }
+	return {
+		renderOutputItem(outputItem, element) {
+			let shadow = element.shadowRoot;
+			if (!shadow) {
+				shadow = element.attachShadow({ mode: 'open' });
+				const root = document.createElement('div');
+				root.id = 'root';
+				shadow.append(root);
+			}
 
-      const root = shadow.querySelector<HTMLElement>('#root');
-      if (!root) {
-        throw new Error('Could not find root element');
-      }
+			const root = shadow.querySelector<HTMLElement>('#root');
+			if (!root) {
+				throw new Error('Could not find root element');
+			}
 
-      errorOverlay.wrap(root, () => {
-        root.innerHTML = '';
-        const node = document.createElement('div');
-        root.appendChild(node);
+			errorOverlay.wrap(root, () => {
+				root.innerHTML = '';
+				const node = document.createElement('div');
+				root.appendChild(node);
 
-        ReactDOM.render(<IssuesList info={{ container: node, mime: outputItem.mime, value: outputItem.json(), context }} />, root);
-      });
-    },
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    disposeOutputItem(_outputId) {
-      // Do any teardown here. outputId is the cell output being deleted, or
-      // undefined if we're clearing all outputs.
-    }
-  };
+				ReactDOM.render(<IssuesList info={{ container: node, mime: outputItem.mime, value: outputItem.json(), context }} />, root);
+			});
+		},
+		// eslint-disable-next-line @typescript-eslint/no-unused-vars
+		disposeOutputItem(_outputId) {
+			// Do any teardown here. outputId is the cell output being deleted, or
+			// undefined if we're clearing all outputs.
+		}
+	};
 };

notebook-renderer-react-sample/src/client/render.tsx

@@ -1,42 +1,42 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import React from "react";
-import type { RendererContext } from 'vscode-notebook-renderer';
-
-interface IRenderInfo {
-  container: HTMLElement;
-  mime: string;
-  value: GitHubIssuesValue[];
-  context: RendererContext<unknown>;
-}
-
-interface GitHubIssuesValue {
-	title: string;
-	url: string;
-  body: string;
-}
-
-export const IssuesList: React.FC<{info: IRenderInfo}> = ({info}) => {
-    const issues = info.value.map(item => {
-      return <tr>
-          <td><a href={item.url}>{item.title}</a></td>
-          <td>{item.body}</td>
-        </tr>;
-    });
-    
-    return <div>
-      <table>
-        <tr>
-          <th>Issue</th>
-          <th>Description</th>
-        </tr>
-        {issues}
-      </table>
-    </div>;
-};
-
-if (module.hot) {
-  module.hot.addDisposeHandler(() => {
-    // In development, this will be called before the renderer is reloaded. You
-    // can use this to clean up or stash any state.
-  });
-}
+/* eslint-disable @typescript-eslint/naming-convention */
+import React from "react";
+import type { RendererContext } from 'vscode-notebook-renderer';
+
+interface IRenderInfo {
+	container: HTMLElement;
+	mime: string;
+	value: GitHubIssuesValue[];
+	context: RendererContext<unknown>;
+}
+
+interface GitHubIssuesValue {
+	title: string;
+	url: string;
+	body: string;
+}
+
+export const IssuesList: React.FC<{ info: IRenderInfo }> = ({ info }) => {
+	const issues = info.value.map(item => {
+		return <tr>
+			<td><a href={item.url}>{item.title}</a></td>
+			<td>{item.body}</td>
+		</tr>;
+	});
+
+	return <div>
+		<table>
+			<tr>
+				<th>Issue</th>
+				<th>Description</th>
+			</tr>
+			{issues}
+		</table>
+	</div>;
+};
+
+if (module.hot) {
+	module.hot.addDisposeHandler(() => {
+		// In development, this will be called before the renderer is reloaded. You
+		// can use this to clean up or stash any state.
+	});
+}

notebook-renderer-react-sample/src/client/tsconfig.json

@@ -1,8 +1,21 @@
 {
-  "files": [],
-  "references": [
-    {
-      "path": "./src/client"
-    }
+  "compilerOptions": {
+    "module": "esnext",
+    "target": "ES2020",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "strict": true,
+    "jsx": "react",
+    // noEmit prevents the default tsc from building this--we use webpack instead
+    "noEmit": true,
+    "rootDir": ".",
+    "types": [
+      "webpack-env",
+      "vscode-notebook-renderer"
+    ],
+    "allowSyntheticDefaultImports": true
+  },
+  "include": [
+    "src/**/*"
   ]
-}
+}