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

Syntax highlighting code snippets #274

Merged
merged 2 commits into from
Sep 20, 2022
Merged

Syntax highlighting code snippets #274

merged 2 commits into from
Sep 20, 2022

Conversation

vargajb
Copy link
Contributor

@vargajb vargajb commented Sep 20, 2022

Proposed changes

Syntax highlighting COBOL and Java snippets.

Fixes # (issue)

Type of change

What type of changes does your PR introduce to the COBOL Programming Course? Put an x in the boxes that apply.

  • Bug fix (change which fixes one or more issues)
  • New feature (change which adds functionality or features to the course)
  • Translations (change which adds or modifies translations of the course)
  • Documentation (change which modifies documentation related to the course)
  • This change requires an update to the course's z/OS environment

Checklist:

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

  • I have read the Contributing Guideline
  • I have included a title and description for this PR
  • I have DCO-signed all of my commits that are included in this PR
  • I have tested it manually and there are no regressions found
  • I have commented my code, particularly in hard-to-understand areas (if appropriate)
  • I have made corresponding changes to the documentation (if appropriate)

Signed-off-by: Janos Varga <113785741+vargajb@users.noreply.github.com>
Signed-off-by: Janos Varga <113785741+vargajb@users.noreply.github.com>
Copy link
Member

@tanto259 tanto259 left a comment

Choose a reason for hiding this comment

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

Thanks @vargajb!

@tanto259 tanto259 added the documentation Improvements or additions to documentation label Sep 20, 2022
@tanto259 tanto259 merged commit c86cb90 into openmainframeproject:master Sep 20, 2022
@vargajb vargajb deleted the Syntax-highlighting-code-snippets branch September 21, 2022 20:46
@vargajb
Copy link
Contributor Author

vargajb commented Sep 21, 2022

Hi @tanto259 ,
as I see there are two opened pull requests ("Split course 1 into course 1 and course 2" (since 15 July), "Add SPDX ID for Lab Materials" (since 8 Feb)) of cobol-programming-cource for several months.
I'm afraid that my already merge -t pull request (Syntax highlighting code snippets #274) will cause merge conflicts.
I would even implement some more improvements that are a bit more complicated than this, but they would cause more merge conflicts.
What do you think these two open pull requests will be merged in the foreseeable future?
BR: János

@tanto259
Copy link
Member

Hi @vargajb,

Thanks for your interest in contributing to the project!

Regarding the two currently open PR, the "Split course 1 into course 1 and course 2" will be merged within the next two months. It is part of the currently ongoing Open Mainframe Project Mentorship Program, which aims to introduce a student into open source contributions.

Among the things we planned for the Mentorship Program is also updating Zowe into using the new team configuration features and possibly adding JSON and XML processing into Course 2.

The SPDX ID may require more time since I need to get the thoughts of other in the team - but hopefully we can reach a conclusion there soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants