Contributed to the JetBrains/intellij-community repository by developing a parsing robustness feature focused on syntax token remapping and rollback. This work introduced a method for remapping tokens within the syntax tree and restoring them during marker rollback, directly addressing edge-case parsing failures that can occur during code edits. By enhancing the reliability of incremental parsing, the feature improved both parsing accuracy and editor stability. The implementation relied on Java and advanced parsing techniques, demonstrating a targeted approach to software development that prioritized resilience in the parsing process. No bug fixes were recorded during this period, with efforts concentrated on this core enhancement.