Skip to content

Commit

Permalink
squash!
Browse files Browse the repository at this point in the history
  • Loading branch information
NikolaRHristov committed Dec 18, 2023
1 parent e381749 commit 56d4460
Show file tree
Hide file tree
Showing 22 changed files with 321 additions and 333 deletions.
2 changes: 1 addition & 1 deletion Source/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function startTour(params: URLSearchParams) {
}

const tour = store.tours.find((tour) =>
tour.id.endsWith(tourPath as string)
tour.id.endsWith(tourPath as string),
);
if (tour) {
startCodeTour(tour, stepNumber);
Expand Down
8 changes: 4 additions & 4 deletions Source/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

import * as vscode from "vscode";

export const enum RefType {
Head,
RemoteHead,
Tag,
export enum RefType {
Head = 0,
RemoteHead = 1,
Tag = 2,
}

export interface Ref {
Expand Down
2 changes: 1 addition & 1 deletion Source/liveShare/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export async function registerLiveShareModule() {
}

async function initializeService(vslsApi: vsls.LiveShare) {
let { initializeService } =
const { initializeService } =
vslsApi.session.role === vsls.Role.Host
? require("./hostService")
: require("./guestService");
Expand Down
2 changes: 1 addition & 1 deletion Source/liveShare/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const TOUR_STARTED_NOTIFICATION = "tourStarted";

export default function (
api: LiveShare,
service: SharedService | SharedServiceProxy
service: SharedService | SharedServiceProxy,
) {
const peer = api.session.peerNumber;

Expand Down
30 changes: 15 additions & 15 deletions Source/notebook/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {

async deserializeNotebook(
content: Uint8Array,
token: any
token: any,
): Promise<vscode.NotebookData> {
this.originalContent = content;
let contents = new TextDecoder().decode(content);
const contents = new TextDecoder().decode(content);

let tour = <CodeTour>JSON.parse(contents);
const tour = <CodeTour>JSON.parse(contents);
const workspaceRoot = getWorkspaceUri(tour);
let steps: any[] = [];
const steps: any[] = [];

for (let item of tour.steps) {
for (const item of tour.steps) {
const uri = await getStepFileUri(item, workspaceRoot, tour.ref);
const document = await vscode.workspace.openTextDocument(uri);

Expand All @@ -29,8 +29,8 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {
const contents = document.getText(
new vscode.Range(
new vscode.Position(startLine, 0),
new vscode.Position(endLine, 10000)
)
new vscode.Position(endLine, 10000),
),
);
steps.push({
contents,
Expand All @@ -40,7 +40,7 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {
});
}

let cells: vscode.NotebookCellData[] = [];
const cells: vscode.NotebookCellData[] = [];

// Title cell
cells.push(
Expand All @@ -51,25 +51,25 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {
}) - ${steps.length} steps\n\n${
tour.description === undefined ? "" : tour.description
}`,
"markdown"
)
"markdown",
),
);

steps.forEach((step, index) => {
const cell = new vscode.NotebookCellData(
2,
step.contents,
step.language
step.language,
);
cell.outputs = [
new vscode.NotebookCellOutput([
new vscode.NotebookCellOutputItem(
new TextEncoder().encode(
`_Step #${index + 1} of ${steps.length}:_ ${
step.description
} ([View File](${step.uri}))`
} ([View File](${step.uri}))`,
),
"text/markdown"
"text/markdown",
),
]),
];
Expand All @@ -80,7 +80,7 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {

async serializeNotebook(
data: vscode.NotebookData,
token: any
token: any,
): Promise<Uint8Array> {
return this.originalContent;
}
Expand All @@ -89,6 +89,6 @@ class CodeTourNotebookProvider implements vscode.NotebookSerializer {
export function registerNotebookProvider() {
vscode.notebook.registerNotebookSerializer(
EXTENSION_NAME,
new CodeTourNotebookProvider()
new CodeTourNotebookProvider(),
);
}
Loading

0 comments on commit 56d4460

Please sign in to comment.