Skip to content

Conversation

@icecream17
Copy link

@icecream17 icecream17 commented Jun 25, 2022

To make #386 reviewable, that pr will be separated into many simpler prs. This is one of them.

The first commit does the following:

  • update package.json
  • update package-lock.json using ./script/build which also seems to update apm/package-lock.json
  • update packages/README.md
  • clone all language packages

I've added these repos to packages but I'm not actually updating the package.json for these packages:

  • language-c
  • language-css
  • language-go
  • language-javascript

Consequently they're unused. See the first commit for an explanation, but basically they're at tree-sitter v19 which currently breaks atom.

Possible changes

A second commit or rebase could take care of these issues:

This would've/will be so useful:
This saves the commit history of the language-packages:
#386 (comment)
https://discord.com/channels/737254137690980372/809982257468801065/988156409977917510

To make atom-community#386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
Copy link
Member

@aminya aminya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the work. Now, this is easier to manage.

Could you run script/lint --fix?

@aminya
Copy link
Member

aminya commented Jun 25, 2022

Are the test failures relevant to these changes?

@mauricioszabo mauricioszabo mentioned this pull request Jun 26, 2022
@ThatXliner
Copy link
Member

ThatXliner commented Jun 29, 2022

Maybe add

waitsForPromise(() => atom.packages.activatePackage(path.join(__dirname, 'fixtures', 'package-with-snippets')));

below https://github.com/atom/snippets/blob/b1ac84ef7dc988ee0417ad9c44f5dd397c929411/spec/snippet-loading-spec.js#L103

for fixing CI.

@ThatXliner
Copy link
Member

ThatXliner commented Jun 29, 2022

Or it could be atom/snippets@2de9091

I guess it's just some sort of flaky test; I wonder happens if you try my suggestion

@aminya
Copy link
Member

aminya commented Jun 30, 2022

We can't add this here. I forked the repository. @ThatXliner do you want to try your fix?
https://github.com/atom-community/snippets

Copy link
Member

@aminya aminya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will merge this regardless of the tests because they seem unrelated. Since this is not merging to master, it is fine.

@aminya aminya merged commit 04d1c61 into atom-community:merge-languages Jun 30, 2022
@icecream17 icecream17 deleted the merge-languages branch July 3, 2022 13:32
icecream17 pushed a commit to icecream17/atom that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of atom-community#399
(atom-community@477b075)
but where the packages that would've broke Atom
are now updated

Another link:
atom-community#403 (comment)
icecream17 pushed a commit that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 9, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 9, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants