Bringing the tree up to formatting parity with clang-format, shellche…

…ck, shfmt, yaml linting, and MD lint (project-chip#432) * Initial restyle * Updating json and pretty * Adding editorconfig * Forcing us to use common pretty-ify versions * Manually moving this up, fixing more pinning * restyle devcontainer * Pulling upstream * Keeping travis off restyled * Testing fix for codecov
mkardous-silabs · Apr 21, 2020 · 0a9545e · 0a9545e
1 parent b3cd438
commit 0a9545e
Show file tree

Hide file tree

Showing 140 changed files with 3,907 additions and 3,652 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -18,7 +18,8 @@ RUN apt-get -fy install git vim emacs sudo \
     iproute2 procps lsb-release \
     bash-completion \
     build-essential cmake cppcheck valgrind \
-    wget curl telnet bsdtar
+    wget curl telnet bsdtar \
+    docker.io
 RUN groupadd --gid $USER_GID $USERNAME
 RUN useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME
 RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
@@ -31,4 +32,9 @@ RUN cd /var/downloads
 RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix | bsdtar -xvf - extension
 RUN mkdir -p /home/vscode/.vscode-server/extensions
 RUN mv extension /home/vscode/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
+RUN mkdir -p /home/vscode/bin
+RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /home/vscode/bin/restyle-path
+RUN chmod +x /home/vscode/bin/restyle-path
 RUN chown -R vscode:vscode /home/vscode
+
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,17 +1,13 @@
 {
     "name": "CHIP Ubuntu Development Environment",
+    "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
             //  "BUILD_VERSION": "$(cat integrations/docker/images/chip-build/version)" // trying to get this to work
             "BUILD_VERSION": "0.2.7"
         }
     },
-    "runArgs": [
-        "--cap-add=SYS_PTRACE",
-        "--security-opt",
-        "seccomp=unconfined"
-    ],
     "remoteUser": "vscode",
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
@@ -23,9 +19,11 @@
         "eamodio.gitlens",
         "yuichinukiyama.vscode-preview-server",
         "aaron-bond.better-comments",
-        "foxundermoon.shell-format"
+        "foxundermoon.shell-format",
+        "editorconfig.editorconfig",
+        "esbenp.prettier-vscode"
     ],
-    // Use 'settings' to set *default* container specific settings.json values on container create. 
+    // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.
     "settings": {
         "terminal.integrated.shell.linux": "/bin/bash"

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,3 @@
+trim_trailing_whitespace = true
+insert_final_newline = false
+indent_style = space
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json.schemastore.org/prettierrc",
+    "printWidth": 80,
+    "tabWidth": 4,
+    "useTabs": false,
+    "semi": true,
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "jsxBracketSameLine": false,
+    "arrowParens": "avoid",
+    "proseWrap": "always"
+}
diff --git a/.restyled.yaml b/.restyled.yaml
@@ -27,6 +27,14 @@ exclude:
     - "third_party/**/*"
     - "third_party/**"
     - "third_party/*"
+    - "third_party"
+    - "**/third_party/**/*"
+    - "**/third_party/*"
+    - "**/third_party/**"
+    - "**/third_party/**/*"
+    - "examples/lock-app/efr32/third_party/**/*"
+    - "examples/lock-app/efr32/third_party/*"
+    - "examples/lock-app/efr32/third_party/**"
     - "build/**/*"
     - "autom4te.cache/**/*"
 
@@ -57,26 +65,40 @@ restylers:
           - "**/*.js"
           - "**/*.m"
       interpreters: []
-    - name: jq
+    - name: prettier-json
+      image: restyled/restyler-prettier:v1.19.1-2
       enabled: true
+      command:
+          - prettier
+          - "--write"
+      arguments: []
       include:
           - "**/*.json"
+      interpreters: []
     - name: prettier-markdown
+      image: restyled/restyler-prettier:v1.19.1-2
+      command:
+          - prettier
+          - "--write"
+      arguments: []
       enabled: true
       include:
           - "**/*.md"
           - "**/*.markdown"
     - name: prettier-yaml
+      image: restyled/restyler-prettier:v1.19.1-2
       enabled: true
       include:
           - "**/*.yml"
           - "**/*.yaml"
     - name: shellharden
+      image: restyled/restyler-shellharden:v4.1.1-2
       enabled: true
       include:
           - "**/*.sh"
           - "**/*.bash"
     - name: shfmt
+      image: restyled/restyler-shfmt:v3.0.1
       enabled: true
       include:
           - "**/*.sh"

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 language: minimal
 
+branches:
+    except:
+    - /^restyled.*$/
+
 services:
   - docker
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,8 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
-
         {
             "name": "QRCode Tests",
             "type": "cppdbg",
@@ -26,7 +24,6 @@
                 }
             ]
         },
-
         {
             "name": "CHIP crypto Tests",
             "type": "cppdbg",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,6 +22,18 @@
     "[dockerfile]": {
         "editor.defaultFormatter": "ms-azuretools.vscode-docker"
     },
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[shellscript]": {
+        "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "[properties]": {
+        "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "[markdown]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
     "files.associations": {
         "iostream": "cpp",
         "array": "cpp",
@@ -66,7 +78,8 @@
         "cinttypes": "cpp",
         "typeinfo": "cpp",
         "*.ipp": "cpp",
-        "aes.h": "c"
+        "aes.h": "c",
+        "stdio.h": "c"
     },
     "files.eol": "\n",
     "editor.formatOnSave": true,
@@ -108,5 +121,6 @@
             "backgroundColor": "transparent"
         }
     ],
-    "clang-format.fallbackStyle": "WebKit"
+    "clang-format.fallbackStyle": "WebKit",
+    "files.trimFinalNewlines": true
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -15,9 +15,7 @@
                 "reveal": "always",
                 "panel": "shared"
             },
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Auto-enforce coding style",
@@ -30,115 +28,91 @@
                 "reveal": "always",
                 "panel": "shared"
             },
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Verify coding style conformance",
             "type": "shell",
             "command": "make -C build/default pretty-check",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Unit and Functional Tests",
             "type": "shell",
             "command": "make -C build/default check",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Distribution Generation",
             "type": "shell",
             "command": "make -C build/default distcheck",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Code Coverage",
             "type": "shell",
             "command": "make -C build/default coverage; code -r build/default/src/chip.info/index.html",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Clean",
             "type": "shell",
             "command": "make -C build/default distclean",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Configure",
             "type": "shell",
             "command": "mkdir -p build/default && (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage)",
             "group": "none",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Bootstrap",
             "type": "shell",
             "command": "if [[ ! -f build/default/config.status ]]; then mkdir -p build/default; (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi",
             "group": "none",
-            "problemMatcher": [
-                "$gcc"
-            ],
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Clean Tree",
             "type": "shell",
             "command": "make -f Makefile-bootstrap clean-repos && git clean -Xdf",
             "group": "none",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Setup Payload Tests",
             "type": "shell",
             "command": "make -C build/default/src/setup_payload check",
             "group": "none",
             "dependsOn": "Bootstrap",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Build & Run Crypto Tests",
             "type": "shell",
             "command": "make -C build/default/src/crypto check",
             "group": "none",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Build nRF5 Lock App",
             "type": "shell",
             "command": "make -C examples/lock-app/nrf5",
             "group": "none",
             "dependsOn": "Clean Tree",
-            "problemMatcher": [
-                "$gcc"
-            ]
-        },
-    ],
+            "problemMatcher": ["$gcc"]
+        }
+    ]
 }