simplify .ms heuristic #4224
Merged
simplify .ms heuristic #4224
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
2 tasks
Alhadis
requested changes
Aug 6, 2018
lib/linguist/heuristics.rb
Outdated
| @@ -323,7 +323,7 @@ def call(data) | |||
| disambiguate ".ms" do |data| | |||
| if /^[.'][a-z][a-z](\s|$)/i.match(data) | |||
| Language["Roff"] | |||
| elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z][_A-Za-z0-9]*:/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, "")) | |||
| elsif !/\/\*/.match(data) && /^\s*\.(include\s|globa?l\s|[A-Za-z][_A-Za-z0-9]*:)/.match(data) | |||
There was a problem hiding this comment.
It wouldn't hurt to make this a non-capturing group:
↓↓
/^\s*\.(?:include\s|globa?l\s|[A-Za-z][_A-Za-z0-9]*:)
↑↑
Simplify .ms heuristic for Unix Assembly by just checking that there is no `/*` string in the file. This is simpler and seems to work with all Unix Assembly files in GitHub. A synthetic MAXScript file was also tested by adding assembly inside a multiline comment.
|
@Alhadis could you have a look? |
Alhadis
approved these changes
Aug 20, 2018
|
Looks good to me. 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Simplify .ms heuristic for Unix Assembly by just checking that there is no
/*string in the file. This is simpler and seems to work with all Unix Assemblyfiles in GitHub. A synthetic MAXScript file was also tested by adding assembly inside
a multiline comment.
Checklist:
None applies?