update version

Author: hilltwice233

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-enhance",
   "description": "A vscode toolkit that make coding more comfortable.",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "private": true,
   "engines": {

readme.md

@@ -17,8 +17,8 @@ please read [Code of Conduct](./code_of_conduct.md) before commit your code.
 
 ## Enhanced git visualization
 
-1. Show committer, relative time and commit summary as the suffix of a line.
-2. Show committer, email and absolute time when hover on the suffix.
+1. Show author, relative time and commit summary as the suffix of a line.
+2. Show author, email and absolute time when hover on the suffix.
 
 ## Enhanced color theme for multi-languages
 

source/extension.ts

@@ -1,8 +1,8 @@
 import * as vscode from "vscode"
-import {enableGitLineHistory} from "./git-line-history.js"
+import {enableGitLineBlame} from "./git-line-blame.js"
 
 export function activate(context: vscode.ExtensionContext) {
-  enableGitLineHistory(context)
+  enableGitLineBlame(context)
 }
 
 export function deactivate() {}

source/git-line-blame.ts

@@ -0,0 +1,133 @@
+import {spawn} from "child_process"
+import * as vscode from "vscode"
+import {format} from "./utils.js"
+
+export function enableGitLineBlame(context: vscode.ExtensionContext) {
+  context.subscriptions.push(
+    vscode.window.onDidChangeTextEditorSelection((event) => {
+      renderGitBlame(event.textEditor)
+    }),
+  )
+}
+
+function renderGitBlame(editor: vscode.TextEditor) {
+  const line = editor.document.lineAt(editor.selection.active.line)
+  if (line.lineNumber >= editor.document.lineCount - 1) {
+    decoration.clear(editor)
+    return
+  }
+
+  const path = editor.document.uri
+  const args = ["blame", "-p", path.path, `-L${line.lineNumber + 1},+1`]
+  const stream = spawn("git", args, {
+    cwd: vscode.workspace.getWorkspaceFolder(path).uri.fsPath,
+  })
+
+  stream.stdout.on("data", (data) => renderGitBlameData(editor, line, data))
+  stream.stderr.on("error", () => {
+    vscode.window.showWarningMessage(
+      `Cannot render Git line blame at: ${path}:${line.lineNumber}`,
+    )
+  })
+}
+
+function renderGitBlameData(
+  editor: vscode.TextEditor,
+  line: vscode.TextLine,
+  data: any,
+) {
+  const blame = new GitLineBlame(data.toString())
+  const message = blame.formatLine()
+  const range = new vscode.Range(
+    line.lineNumber,
+    line.text.length,
+    line.lineNumber,
+    line.text.length + message.length,
+  )
+  decoration.updateOptions(editor, {
+    range,
+    hoverMessage: blame.formatHover(),
+    renderOptions: {after: {contentText: message}},
+  })
+}
+
+namespace decoration {
+  let currentType = vscode.window.createTextEditorDecorationType({
+    after: {
+      textDecoration: "none; opacity: 25%",
+      margin: "0 0 0 1rem",
+    },
+  })
+
+  let currentOptions: vscode.DecorationOptions[] = []
+
+  export function clear(editor: vscode.TextEditor) {
+    currentOptions = []
+    editor.setDecorations(currentType, currentOptions)
+  }
+
+  export function updateType(
+    editor: vscode.TextEditor,
+    type: vscode.TextEditorDecorationType,
+  ) {
+    clear(editor)
+    currentType = type
+    editor.setDecorations(type, currentOptions)
+  }
+
+  export function updateOptions(
+    editor: vscode.TextEditor,
+    option: vscode.DecorationOptions,
+  ) {
+    clear(editor)
+    currentOptions = [option]
+    editor.setDecorations(currentType, currentOptions)
+  }
+}
+
+class GitLineBlame {
+  readonly committed: boolean
+  readonly author: string
+  readonly authorMail: string
+  readonly authorTime: number
+  readonly authorTimeZone: string
+  readonly summary: string
+
+  constructor(raw: string) {
+    const map = this.map(raw)
+    this.author = map["author"]
+    this.authorMail = map["author-mail"]
+    this.authorTime = parseInt(map["author-time"])
+    this.authorTimeZone = map["author-tz"]
+    this.summary = map["summary"]
+
+    this.committed = this.author !== "Not Committed Yet"
+  }
+
+  private map(raw: string) {
+    const lines = raw.split("\n")
+    lines[0] = `commit-id ${lines[0]}`
+    lines[lines.length - 1] = `content ${lines[lines.length - 1]}`
+
+    const handler = {}
+    for (const line of lines) {
+      const parts = line.split(" ")
+      handler[parts[0]] = parts.slice(1).join(" ")
+    }
+    return handler
+  }
+
+  formatLine(): string {
+    if (!this.committed) return "Not Committed Yet..."
+    const duration = format.duration(Date.now() - this.authorTime * 1000)
+    return `${this.author}, ${duration} • ${this.summary}`
+  }
+
+  formatHover(): string {
+    if (!this.committed) return "Not Committed Yet..."
+    return (
+      `${this.author} <${this.authorMail}>, ` +
+      `${format.timestamp(this.authorTime * 1000)} ${this.authorTimeZone}`
+    )
+  }
+}

source/git-line-history.ts

@@ -1,15 +1,28 @@
-export function formatTime(timestamp: number) {
-  const time = new Date(timestamp)
-  const year = time.getFullYear()
-  const month = time.getMonth() + 1
-  const date = time.getDate()
-  const weekday = time.getDay()
-  const hours = time.getHours()
-  const minutes = format2(time.getMinutes())
-  return `${year}.${month}.${date}(${weekday}) ${hours}:${minutes}`
-}
+export namespace format {
+  export function duration(milliseconds: number) {
+    if (milliseconds < 1000) return `${milliseconds}ms`
+    milliseconds = Math.floor(milliseconds / 1000)
+    if (milliseconds < 60) return `${milliseconds}s`
+    milliseconds = Math.floor(milliseconds / 60)
+    if (milliseconds < 60) return `${milliseconds}min`
+    milliseconds = Math.floor(milliseconds / 60)
+    if (milliseconds < 24) return `${milliseconds}hours`
+    milliseconds = Math.floor(milliseconds / 24)
+    if (milliseconds < 31) return `${milliseconds}days`
+    milliseconds = Math.floor(milliseconds / 30.5)
+    if (milliseconds < 12) return `${milliseconds}months`
+    milliseconds = Math.floor(milliseconds / 12)
+    return `${milliseconds}years`
+  }
 
-function format2(raw: number) {
-  if (raw < 10) return `0${raw}`
-  else return raw.toString()
+  export function timestamp(timestamp: number) {
+    const time = new Date(timestamp)
+    const year = time.getFullYear()
+    const month = time.getMonth() + 1
+    const date = time.getDate()
+    const weekday = time.getDay()
+    const hours = time.getHours()
+    const minutes = time.getMinutes().toString().padStart(2, "0")
+    return `${year}.${month}.${date}(${weekday}) ${hours}:${minutes}`
+  }
 }