Просмотр исходного кода

:memo: add vscode settings & fix git pr memo

Jeremy Zheng 3 лет назад
Родитель
Сommit
ca9ca43961
4 измененных файлов с 71 добавлено и 3 удалено
  1. 0 1
      .gitignore
  2. 23 0
      .vscode/extensions.json
  3. 34 0
      .vscode/settings.json
  4. 14 2
      documents/development/git/README.md

+ 0 - 1
.gitignore

@@ -1,2 +1 @@
-/.vscode/
 tmp

+ 23 - 0
.vscode/extensions.json

@@ -0,0 +1,23 @@
+{
+  "recommendations": [
+    "ms-vscode.cpptools-extension-pack",
+    "ms-python.python",
+    "golang.go",
+    "rust-lang.rust-analyzer",
+    "redhat.ansible",
+    "redhat.vscode-xml",
+    "redhat.vscode-yaml",
+    "bungcip.better-toml",
+    "gaborv.flatbuffers",
+    "yzhang.markdown-all-in-one",
+    "zxh404.vscode-proto3",
+    "ms-vscode-remote.remote-ssh",
+    "ms-azuretools.vscode-docker",
+    "vscode-icons-team.vscode-icons",
+    "akamud.vscode-theme-onedark",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "editorconfig.editorconfig",
+    "gruntfuggly.todo-tree"
+  ]
+}

+ 34 - 0
.vscode/settings.json

@@ -0,0 +1,34 @@
+{
+  "files.autoSave": "onFocusChange",
+  "files.insertFinalNewline": true,
+  "workbench.colorTheme": "Atom One Dark",
+  "window.zoomLevel": 2,
+  "editor.formatOnSave": true,
+  "editor.fontFamily": "source code pro",
+  "editor.mouseWheelZoom": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "rust-analyzer.cargo.runBuildScripts": true,
+  // https://code.visualstudio.com/docs/setup/linux#_visual-studio-code-is-unable-to-watch-for-file-changes-in-this-large-workspace-error-enospc
+  "files.watcherExclude": {
+    "**/.git/**": true,
+    "**/node_modules/**": true
+  },
+  "[cpp]": {
+    "editor.defaultFormatter": "ms-vscode.cpptools"
+  },
+  "[rust]": {
+    "editor.defaultFormatter": "rust-lang.rust-analyzer"
+  },
+  "[proto3]": {
+    "editor.defaultFormatter": "zxh404.vscode-proto3"
+  },
+  "[xml]": {
+    "editor.defaultFormatter": "redhat.vscode-xml"
+  },
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.python"
+  }
+}

+ 14 - 2
documents/development/git/README.md

@@ -4,6 +4,7 @@
 
 - 创建 ssh key `ssh-keygen -t ed25519 -C "your_email@example.com"`
 - 打开 github settings 页面 放置 `~/.ssh/id_ed25519.pub`
+
   ![ssh-key.png](ssh-key.png)
 
 ## 常见 git 设置
@@ -18,12 +19,20 @@ git config --global pull.rebase false
 
 - fork 项目
 
-  - 点击 fork 按钮 ![1.png](fork/1.png)
-  - 输入项目信息 ![2.png](fork/2.png)
+  - 点击 fork 按钮
+
+    ![1.png](fork/1.png)
+
+  - 输入项目信息
+
+    ![2.png](fork/2.png)
 
 - Clone 项目 `git clone git@github.com:YOUR_ID/mint.git ~/workspace/mint`
+
   ![clone.png](clone.png)
+
 - 设置 upstream
+
   ![set upstream](set-upstream.png)
 
 ## 日常工作流程
@@ -43,6 +52,9 @@ git config --global pull.rebase false
 ## 给主 repo 发 pr
 
 - 点击[pull requests](https://github.com/iapt-platform/mint/pulls)中的"New pull request"
+
   ![new pr](pull-request/new.png)
+
 - 选择主 repo 的 branch(agile)和自己的 branch
+
   ![comparing pr](pull-request/comparing.png)