Restore gitignore for .*.swp in sub-directories #1958
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `/.*.swp` will only ignore swp files in the root of this project. (not sub-folders) It won't ignore swp files in src/, etc.
jinyongyoo
pushed a commit
to jinyongyoo/psalm
that referenced
this pull request
Jul 24, 2019
The `/.*.swp` will only ignore swp files in the root of this project. (not sub-folders) It won't ignore swp files in src/, etc.
voku
added a commit
to voku/psalm
that referenced
this pull request
Jul 25, 2019
* upstream/master: (609 commits) Register so it doesn’t get removed Add support for compact Allow suppression of unused variable issues Fix tests Fix unused ref in assign op Issue 1926 unused variable (vimeo#1967) Fix ignoreExceptions tags (vimeo#1966) Improve DOM extension types (vimeo#1965) Fix infinite recursion on property types Analyse binary ops always Mark private properties unused when referenced only in constructor (vimeo#1962) Prefix constant Add slash Normalise plugin path Also convert \\ to / when scanning windows configs on macs Fix file path weirdness when scanning config files Reduce with / before converting back Improve behaviour of templated template assertions Break out templated assertion tests Restore gitignore for .*.swp in sub-directories (vimeo#1958) ... # Conflicts: # src/Psalm/Config.php # src/Psalm/Context.php # src/Psalm/Internal/Analyzer/ClassAnalyzer.php # src/Psalm/Internal/Analyzer/CommentAnalyzer.php # src/Psalm/Internal/Analyzer/FileAnalyzer.php # src/Psalm/Internal/Analyzer/FunctionAnalyzer.php # src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php # src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php # src/Psalm/Internal/Analyzer/MethodAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Block/LoopAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ConstFetchAnalyzer.php # src/Psalm/Internal/Analyzer/Statements/ReturnAnalyzer.php # src/Psalm/Internal/Analyzer/StatementsAnalyzer.php # src/Psalm/Internal/Analyzer/TypeAnalyzer.php # src/Psalm/Internal/Codebase/Analyzer.php # src/Psalm/Internal/Codebase/ClassLikes.php # src/Psalm/Internal/Codebase/Populator.php # src/Psalm/Internal/Codebase/Properties.php # src/Psalm/Internal/Codebase/Scanner.php # src/Psalm/Internal/LanguageServer/LanguageServer.php # src/Psalm/Internal/LanguageServer/Server/TextDocument.php # src/Psalm/Internal/Provider/FunctionExistenceProvider.php # src/Psalm/Internal/Provider/FunctionParamsProvider.php # src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php # src/Psalm/Internal/Provider/MethodExistenceProvider.php # src/Psalm/Internal/Provider/MethodParamsProvider.php # src/Psalm/Internal/Provider/MethodReturnTypeProvider.php # src/Psalm/Internal/Provider/MethodVisibilityProvider.php # src/Psalm/Internal/Provider/PropertyExistenceProvider.php # src/Psalm/Internal/Provider/PropertyTypeProvider.php # src/Psalm/Internal/Provider/PropertyVisibilityProvider.php # src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php # src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayReduceReturnTypeProvider.php # src/Psalm/Internal/Type/ParseTree.php # src/Psalm/Internal/Type/TypeCombination.php # src/Psalm/Internal/Visitor/ReflectorVisitor.php # src/Psalm/Type.php # src/Psalm/Type/Atomic/TNamedObject.php # src/Psalm/Type/Reconciler.php # src/command_functions.php
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
/.*.swpwill only ignore swp files in the root of this project.(not sub-folders)
It won't ignore swp files in src/, etc.