Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve support of default editorconfig properties #1580

Merged

Commits on Aug 13, 2022

  1. Improve support of default editorconfig properties

    Deprecate ExperimentalParams.editorConfigDefaults in favor of new parameter
    ExperimentalParams.editorConfigDefaults. When used in the old implementation
    this resulted in ignoring all ".editorconfig" files on the path to the file.
    The new implementation uses properties from the "editorConfigDefaults"
    parameter only when no ".editorconfig" files on the path to the file supplies
    this property for the filepath.
    Closes pinterest#1551
    
    API consumers can easily create the EditConfigDefaults by calling
     "EditConfigDefaults.load(path)" or creating it programmatically.
    
    The CLI still supports the "--editorconfig=" option but has improved support.
    The path given can be either be a path to file or directory. In case of a
    directory path, it is expected that the directory does contain a file with
    name ".editorconfig". In of a file path, any valid file name is accepted. The
    path can be relative or absolute. Depending on the OS, the "~" at the start of
    the path is accepted as well.
    
    BaseCLITest no longer always waits 3 seconds for completion of the asynchronous
    process. Once the process is started, it checks every 100 ms whether the process
    is still alive (e.g. is running) and stops polling otherwise resulting in better
    performance (most notable on local machine). The maximum duration of the CLI
    test has been increased to 10 seconds.
    paul-dingemans committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    54f8194 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    28b90fb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    236e611 View commit details
    Browse the repository at this point in the history
  4. update changelog

    paul-dingemans committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    8b2ee55 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. Configuration menu
    Copy the full SHA
    757be14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    669414f View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/1551-editorconfig-path-cli' into…

    … 1551-editorconfig-path-cli
    paul-dingemans committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    9552ad4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    547f765 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Fix changelog

    paul-dingemans committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    63fe43c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    42454e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Merge branch 'master' into 1551-editorconfig-path-cli

    # Conflicts:
    #	CHANGELOG.md
    #	ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/EditorConfigLoader.kt
    #	ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/PreparedCode.kt
    #	ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/ThreadSafeEditorConfigCache.kt
    #	ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigLoaderTest.kt
    #	ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt
    paul-dingemans committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    fdf06dd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    211af20 View commit details
    Browse the repository at this point in the history