Commit c08f2293 authored by AUTOMATIC's avatar AUTOMATIC
Browse files

Merge branch 'eslint' into dev

parents 1ceb82bc 57b75f4a
Loading
Loading
Loading
Loading

.eslintignore

0 → 100644
+4 −0
Original line number Diff line number Diff line
extensions
extensions-disabled
repositories
venv
 No newline at end of file

.eslintrc.js

0 → 100644
+89 −0
Original line number Diff line number Diff line
module.exports = {
    env: {
        browser: true,
        es2021: true,
    },
    extends: "eslint:recommended",
    parserOptions: {
        ecmaVersion: "latest",
    },
    rules: {
        "arrow-spacing": "error",
        "block-spacing": "error",
        "brace-style": "error",
        "comma-dangle": ["error", "only-multiline"],
        "comma-spacing": "error",
        "comma-style": ["error", "last"],
        "curly": ["error", "multi-line", "consistent"],
        "eol-last": "error",
        "func-call-spacing": "error",
        "function-call-argument-newline": ["error", "consistent"],
        "function-paren-newline": ["error", "consistent"],
        "indent": ["error", 4],
        "key-spacing": "error",
        "keyword-spacing": "error",
        "linebreak-style": ["error", "unix"],
        "no-extra-semi": "error",
        "no-mixed-spaces-and-tabs": "error",
        "no-trailing-spaces": "error",
        "no-whitespace-before-property": "error",
        "object-curly-newline": ["error", {consistent: true, multiline: true}],
        "quote-props": ["error", "consistent-as-needed"],
        "semi": ["error", "always"],
        "semi-spacing": "error",
        "semi-style": ["error", "last"],
        "space-before-blocks": "error",
        "space-before-function-paren": ["error", "never"],
        "space-in-parens": ["error", "never"],
        "space-infix-ops": "error",
        "space-unary-ops": "error",
        "switch-colon-spacing": "error",
        "template-curly-spacing": ["error", "never"],
        "unicode-bom": "error",
        "no-multi-spaces": "error",
        "object-curly-spacing": ["error", "never"],
        "operator-linebreak": ["error", "after"],
        "no-unused-vars": "off",
        "no-redeclare": "off",
    },
    globals: {
        // this file
        module: "writable",
        //script.js
        gradioApp: "writable",
        onUiLoaded: "writable",
        onUiUpdate: "writable",
        onOptionsChanged: "writable",
        uiCurrentTab: "writable",
        uiElementIsVisible: "writable",
        executeCallbacks: "writable",
        //ui.js
        opts: "writable",
        all_gallery_buttons: "writable",
        selected_gallery_button: "writable",
        selected_gallery_index: "writable",
        args_to_array: "writable",
        switch_to_txt2img: "writable",
        switch_to_img2img_tab: "writable",
        switch_to_img2img: "writable",
        switch_to_sketch: "writable",
        switch_to_inpaint: "writable",
        switch_to_inpaint_sketch: "writable",
        switch_to_extras: "writable",
        get_tab_index: "writable",
        create_submit_args: "writable",
        restart_reload: "writable",
        updateInput: "writable",
        //extraNetworks.js
        requestGet: "writable",
        popup: "writable",
        // from python
        localization: "writable",
        // progrssbar.js
        randomId: "writable",
        requestProgress: "writable",
        // imageviewer.js
        modalPrevImage: "writable",
        modalNextImage: "writable",
    }
};
+12 −24
Original line number Diff line number Diff line
# See https://github.com/actions/starter-workflows/blob/1067f16ad8a1eac328834e4b0ae24f7d206f810d/ci/pylint.yml for original reference file
name: Run Linting/Formatting on Pull Requests

on:
  - push
  - pull_request
  # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore for syntax docs
  # if you want to filter out branches, delete the `- pull_request` and uncomment these lines :
  # pull_request:  
  #  branches:
  #    - master
  #  branches-ignore:
  #    - development

jobs:
  lint:
  lint-python:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Code
@@ -29,18 +21,14 @@ jobs:
        run: pip install ruff==0.0.265
      - name: Run Ruff
        run: ruff .

# The rest are currently disabled pending fixing of e.g. installing the torch dependency.

#      - name: Install PyLint
#        run: |
#          python -m pip install --upgrade pip
#          pip install pylint
#      # This lets PyLint check to see if it can resolve imports
#      - name: Install dependencies
#        run: |
#          export COMMANDLINE_ARGS="--skip-torch-cuda-test --exit"
#          python launch.py
#      - name: Analysing the code with pylint
#        run: |
#          pylint $(git ls-files '*.py')
  lint-js:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Code
        uses: actions/checkout@v3
      - name: Install Node.js
        uses: actions/setup-node@v3
        with:
          node-version: 18
      - run: npm i --ci
      - run: npm run lint
+2 −0
Original line number Diff line number Diff line
@@ -34,3 +34,5 @@ notification.mp3
/test/stderr.txt
/cache.json*
/config_states/
/node_modules
/package-lock.json
 No newline at end of file
+26 −26
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@

function checkBrackets(textArea, counterElt) {
    var counts = {};
  (textArea.value.match(/[(){}\[\]]/g) || []).forEach(bracket => {
    (textArea.value.match(/[(){}[\]]/g) || []).forEach(bracket => {
        counts[bracket] = (counts[bracket] || 0) + 1;
    });
    var errors = [];
@@ -27,7 +27,7 @@ function checkBrackets(textArea, counterElt) {

function setupBracketChecking(id_prompt, id_counter) {
    var textarea = gradioApp().querySelector("#" + id_prompt + " > label > textarea");
  var counter = gradioApp().getElementById(id_counter)
    var counter = gradioApp().getElementById(id_counter);

    if (textarea && counter) {
        textarea.addEventListener("input", () => checkBrackets(textarea, counter));
Loading